diff -ruN lilypond-2.10.25-orig/Documentation/user/lilypond.tely lilypond-2.10.25/Documentation/user/lilypond.tely
--- lilypond-2.10.25-orig/Documentation/user/lilypond.tely	2007-07-19 23:01:23.000000000 +0200
+++ lilypond-2.10.25/Documentation/user/lilypond.tely	2007-07-19 23:01:47.000000000 +0200
@@ -34,13 +34,13 @@
 @c 
 @dircategory LilyPond
 @direntry
-* LilyPond: (lilypond/lilypond).           The GNU music typesetter.
-* abc2ly: (lilypond/lilypond)Invoking abc2ly.          Importing ABC.      
-* convert-ly: (lilypond/lilypond)Invoking convert-ly.  Older LilyPond versions.
-* etf2ly: (lilypond/lilypond)Invoking etf2ly.          Importing Finale.
-* lilypond-book: (lilypond/lilypond)LilyPond-book.     Itegrating text and music.
-* midi2ly: (lilypond/lilypond)Invoking midi2ly.        Importing MIDI.
-* mup2ly: (lilypond/lilypond)Invoking mup2ly.          Importing Mup.
+* LilyPond: (lilypond).           The GNU music typesetter.
+* abc2ly: (lilypond)Invoking abc2ly.          Importing ABC.      
+* convert-ly: (lilypond)Invoking convert-ly.  Older LilyPond versions.
+* etf2ly: (lilypond)Invoking etf2ly.          Importing Finale.
+* lilypond-book: (lilypond)LilyPond-book.     Itegrating text and music.
+* midi2ly: (lilypond)Invoking midi2ly.        Importing MIDI.
+* mup2ly: (lilypond)Invoking mup2ly.          Importing Mup.
 @end direntry
 
 @c don't remove this comment.
diff -ruN lilypond-2.10.25-orig/Documentation/user/music-glossary.tely lilypond-2.10.25/Documentation/user/music-glossary.tely
--- lilypond-2.10.25-orig/Documentation/user/music-glossary.tely	2007-07-19 23:01:23.000000000 +0200
+++ lilypond-2.10.25/Documentation/user/music-glossary.tely	2007-07-19 23:01:47.000000000 +0200
@@ -17,6 +17,11 @@
 and as @uref{source/Documentation/user/music-glossary.html,one big page}.
 @end ifhtml
 
+@dircategory GNU music project
+@direntry
+* Glossary: (music-glossary).                  Glossary of music terms.
+@end direntry
+
 @titlepage
 @title Music Glossary
 @author Christian Mondrup   @c Original author of LilyPond glossary
diff -ruN lilypond-2.10.25-orig/config.make.in lilypond-2.10.25/config.make.in
--- lilypond-2.10.25-orig/config.make.in	2007-07-19 23:01:23.000000000 +0200
+++ lilypond-2.10.25/config.make.in	2007-07-19 23:01:47.000000000 +0200
@@ -28,7 +28,7 @@
 FREETYPE2_LIBS = @FREETYPE2_LIBS@
 PANGO_FT2_LIBS = @PANGO_FT2_LIBS@
 
-CONFIG_LIBS = @LIBS@ @EXTRA_LIBS@ $(GUILE_LIBS) $(PANGO_FT2_LIBS) $(FONTCONFIG_LIBS) $(FREETYPE2_LIBS)
+CONFIG_LIBS = @LIBS@ @EXTRA_LIBS@ $(PANGO_FT2_LIBS) $(FONTCONFIG_LIBS) $(FREETYPE2_LIBS) $(GUILE_LIBS)
 CONFIG_LDFLAGS = @LDFLAGS@
 
 PACKAGE = @PACKAGE@
@@ -66,7 +66,7 @@
 stepmake = @stepmake@
 
 package_datadir = $(datadir)/$(package)
-package_infodir = $(infodir)/$(package)
+package_infodir = $(infodir)
 package_libdir = $(libdir)/$(package)
 package_docdir = $(docdir)/$(package)
 package_omfdir = $(omfdir)/$(package)