--- a/binutils/bfd/doc/bfd.texinfo
+++ b/binutils/bfd/doc/bfd.texinfo
@@ -7,11 +7,10 @@
 @synindex fn cp
 
 @ifinfo
-@format
-START-INFO-DIR-ENTRY
-* Bfd: (bfd).                   The Binary File Descriptor library.
-END-INFO-DIR-ENTRY
-@end format
+@dircategory System/Libraries
+@direntry
+* Bfd: (bfd).                                   The Binary File Descriptor library.
+@end direntry
 @end ifinfo
 
 @copying
--- a/binutils/binutils/doc/binutils.texi
+++ b/binutils/binutils/doc/binutils.texi
@@ -23,7 +23,7 @@ section entitled ``GNU Free Documentation License''.
 @c man end
 @end copying
 
-@dircategory Software development
+@dircategory Development/Other
 @direntry
 * Binutils: (binutils).         The GNU binary utilities.
 @end direntry
--- a/binutils/etc/configure.texi
+++ b/binutils/etc/configure.texi
@@ -5,9 +5,9 @@
 @setchapternewpage off
 @c %**end of header
 
-@dircategory GNU admin
+@dircategory Development/Other
 @direntry
-* configure: (configure).	The GNU configure and build system
+* configure: (configure).                       The GNU configure and build system
 @end direntry
 
 @ifnottex
--- a/binutils/etc/standards.texi
+++ b/binutils/etc/standards.texi
@@ -6,9 +6,9 @@
 @set lastupdate July 22, 2007
 @c %**end of header
 
-@dircategory GNU organization
+@dircategory Development/Other
 @direntry
-* Standards: (standards).         GNU coding standards.
+* Standards: (standards).                      GNU coding standards.
 @end direntry
 
 @c @setchapternewpage odd
--- a/binutils/gas/doc/as.texinfo
+++ b/binutils/gas/doc/as.texinfo
@@ -85,12 +85,11 @@
 @end ifinfo
 
 @ifinfo
-@format
-START-INFO-DIR-ENTRY
-* As: (as).                     The GNU assembler.
-* Gas: (as).                    The GNU assembler.
-END-INFO-DIR-ENTRY
-@end format
+@dircategory Development/Other
+@direntry
+* As: (as).                                     The GNU assembler.
+* Gas: (as).                                    The GNU assembler.
+@end direntry
 @end ifinfo
 
 @finalout
--- a/binutils/gprof/gprof.texi
+++ b/binutils/gprof/gprof.texi
@@ -11,13 +11,10 @@
 @c man end
 
 @ifinfo
-@c This is a dir.info fragment to support semi-automated addition of
-@c manuals to an info tree.  zoo@cygnus.com is developing this facility.
-@format
-START-INFO-DIR-ENTRY
-* gprof: (gprof).                Profiling your program's execution
-END-INFO-DIR-ENTRY
-@end format
+@dircategory Development/Other
+@direntry
+* gprof: (gprof).                               Profiling your program's execution
+@end direntry
 @end ifinfo
 
 @copying
--- a/binutils/ld/Makefile.am
+++ b/binutils/ld/Makefile.am
@@ -91,9 +91,9 @@ CXX_FOR_TARGET = ` \
   fi`
 
 noinst_PROGRAMS = ld-new
-info_TEXINFOS = ld.texinfo
 ld_TEXINFOS = configdoc.texi
-noinst_TEXINFOS = ldint.texinfo
+info_TEXINFOS = ld.texinfo ldint.texinfo
+noinst_TEXINFOS =
 man_MANS = ld.1
 
 AM_MAKEINFOFLAGS = -I $(srcdir) -I $(BFDDIR)/doc -I ../bfd/doc \
--- a/binutils/ld/ld.texinfo
+++ b/binutils/ld/ld.texinfo
@@ -39,11 +39,10 @@
 @c man end
 
 @ifinfo
-@format
-START-INFO-DIR-ENTRY
-* Ld: (ld).                       The GNU linker.
-END-INFO-DIR-ENTRY
-@end format
+@dircategory Development/Other
+@direntry
+* Ld: (ld).                                     The GNU linker.
+@end direntry
 @end ifinfo
 
 @copying
--- a/binutils/ld/ldint.texinfo
+++ b/binutils/ld/ldint.texinfo
@@ -5,11 +5,10 @@
 @c Free Software Foundation, Inc.
 
 @ifinfo
-@format
-START-INFO-DIR-ENTRY
-* Ld-Internals: (ldint).	The GNU linker internals.
-END-INFO-DIR-ENTRY
-@end format
+@dircategory Development/Other
+@direntry
+* Ld-Internals: (ldint).                        The GNU linker internals.
+@end direntry
 @end ifinfo
 
 @copying
--- a/binutils/libiberty/libiberty.texi
+++ b/binutils/libiberty/libiberty.texi
@@ -11,10 +11,10 @@
 @finalout
 @c %**end of header
 
-@dircategory GNU libraries
+@dircategory Development/C
 @direntry
-* Libiberty: (libiberty).          Library of utility functions which
-                                   are missing or broken on some systems.
+* Libiberty: (libiberty).                       Library of utility functions which
+                                                are missing or broken on some systems.
 @end direntry
 
 @macro libib