--- doc/automake.texi.orig	Sat Jul  9 11:28:44 2005
+++ doc/automake.texi	Thu Jul 22 14:00:37 2010
@@ -1,7 +1,8 @@
 \input texinfo   @c -*-texinfo-*-
 @c %**start of header
-@setfilename automake.info
-@settitle automake
+@setfilename automake${SUFFIX}.info
+@dircategory Programming & development tools
+@settitle automake${SUFFIX}
 @setchapternewpage off
 @c %**end of header
 
@@ -34,12 +35,7 @@ published by the Free Software Foundation raise funds 
 
 @dircategory Software development
 @direntry
-* automake: (automake).         Making Makefile.in's.
-@end direntry
-
-@dircategory Individual utilities
-@direntry
-* aclocal: (automake)Invoking aclocal.          Generating aclocal.m4.
+* automake${SUFFIX}: (automake${SUFFIX}).         Making Makefile.in's.
 @end direntry
 
 @titlepage