--- doc/autoconf.texi.orig	Tue Nov  4 09:33:44 2003
+++ doc/autoconf.texi	Sat Mar  8 14:09:55 2008
@@ -4,6 +4,7 @@
 @setfilename autoconf.info
 @include version.texi
 @settitle Autoconf
+@dircategory Programming & development tools
 @setchapternewpage odd
 @setcontentsaftertitlepage
 @finalout
@@ -210,27 +211,27 @@ published by the Free Software Foundation raise funds 
 
 @dircategory Software development
 @direntry
-* Autoconf: (autoconf).         Create source code configuration scripts.
+* Autoconf-2.58: (autoconf-2.58).         Create source code configuration scripts.
 @end direntry
 
 @dircategory Individual utilities
 @direntry
-* autoscan: (autoconf)autoscan Invocation.
+* autoscan-2.58: (autoconf-2.58)autoscan Invocation.
                                 Semi-automatic @file{configure.ac} writing
-* ifnames: (autoconf)ifnames Invocation.        Listing conditionals in source.
-* autoconf: (autoconf)autoconf Invocation.
+* ifnames-2.58: (autoconf-2.58)ifnames Invocation.        Listing conditionals in source.
+* autoconf-2.58: (autoconf-2.58)autoconf Invocation.
                                 How to create configuration scripts
-* autoreconf: (autoconf)autoreconf Invocation.
+* autoreconf-2.58: (autoconf-2.58)autoreconf Invocation.
                                 Remaking multiple @command{configure} scripts
-* autoheader: (autoconf)autoheader Invocation.
+* autoheader-2.58: (autoconf-2.58)autoheader Invocation.
                                 How to create configuration templates
-* autom4te: (autoconf)autom4te Invocation.
+* autom4te-2.58: (autoconf-2.58)autom4te Invocation.
                                 The Autoconf executables backbone
-* configure: (autoconf)configure Invocation.    Configuring a package.
-* autoupdate: (autoconf)autoupdate Invocation.
+* configure-2.58: (autoconf-2.58)configure Invocation.    Configuring a package.
+* autoupdate-2.58: (autoconf-2.58)autoupdate Invocation.
                                 Automatic update of @file{configure.ac}
-* config.status: (autoconf)config.status Invocation. Recreating configurations.
-* testsuite: (autoconf)testsuite Invocation.    Running an Autotest test suite.
+* config.status-2.58: (autoconf-2.58)config.status Invocation. Recreating configurations.
+* testsuite-2.58: (autoconf-2.58)testsuite Invocation.    Running an Autotest test suite.
 @end direntry
 
 @titlepage
