Applied additional patch to allow compilation with texinfo 5.0