diff -urN binutils-2.12.90.0.1.org/bfd/doc/bfd.texinfo binutils-2.12.90.0.1/bfd/doc/bfd.texinfo
--- binutils-2.12.90.0.1.org/bfd/doc/bfd.texinfo	Mon Mar 11 22:37:36 2002
+++ binutils-2.12.90.0.1/bfd/doc/bfd.texinfo	Mon Mar 11 22:37:52 2002
@@ -21,9 +21,10 @@
 
 @ifinfo
 @format
-START-INFO-DIR-ENTRY
-* Bfd: (bfd).                   The Binary File Descriptor library.
-END-INFO-DIR-ENTRY
+@dircategory Programming tools:
+@direntry
+* Bfd: (bfd).				The Binary File Descriptor library
+@end direntry
 @end format
 @end ifinfo
 
diff -urN binutils-2.12.90.0.1.org/etc/configure.texi binutils-2.12.90.0.1/etc/configure.texi
--- binutils-2.12.90.0.1.org/etc/configure.texi	Mon Mar 11 22:37:37 2002
+++ binutils-2.12.90.0.1/etc/configure.texi	Mon Mar 11 22:37:52 2002
@@ -5,9 +5,9 @@
 @setchapternewpage off
 @c %**end of header
 
-@dircategory GNU admin
+@dircategory Programming tools:
 @direntry
-* configure: (configure).	The GNU configure and build system
+* configure: (configure).		The GNU configure and build system
 @end direntry
 
 @ifinfo
--- binutils-2.18.50.0.1/etc/standards.texi.orig	2007-09-08 19:33:36.000000000 +0200
+++ binutils-2.18.50.0.1/etc/standards.texi	2007-09-15 21:32:14.252217649 +0200
@@ -6,9 +6,9 @@
 @set lastupdate July 22, 2007
 @c %**end of header
 
-@dircategory GNU organization
+@dircategory Miscellaneous:
 @direntry
-* Standards: (standards).         GNU coding standards.
+* Standards: (standards).		GNU coding standards
 @end direntry
 
 @c @setchapternewpage odd
diff -urN binutils-2.12.90.0.1.org/gas/doc/as.texinfo binutils-2.12.90.0.1/gas/doc/as.texinfo
--- binutils-2.12.90.0.1.org/gas/doc/as.texinfo	Mon Mar 11 22:37:38 2002
+++ binutils-2.12.90.0.1/gas/doc/as.texinfo	Mon Mar 11 22:40:25 2002
@@ -117,10 +117,11 @@
 
 @ifinfo
 @format
-START-INFO-DIR-ENTRY
-* As: (as).                     The GNU assembler.
-* Gas: (as).                    The GNU assembler.
-END-INFO-DIR-ENTRY
+@dircategory Programming tools:
+@direntry
+* As: (as).				The GNU assembler
+* Gas: (as).				The GNU assembler
+@end direntry
 @end format
 @end ifinfo
 
diff -urN binutils-2.14.90.0.7.org/gas/doc/gasp.texinfo binutils-2.14.90.0.7/gas/doc/gasp.texinfo
--- binutils-2.14.90.0.7.org/gas/doc/gasp.texinfo	Mon Mar 11 22:37:38 2002
+++ binutils-2.14.90.0.7/gas/doc/gasp.texinfo	Mon Mar 11 22:37:52 2002
@@ -14,9 +14,10 @@
 
 @ifinfo
 @format
-START-INFO-DIR-ENTRY
-* gasp: (gasp).                     The GNU Assembler Preprocessor
-END-INFO-DIR-ENTRY
+@dircategory Programming tools:
+@direntry
+* gasp: (gasp).				The GNU Assembler Preprocessor
+@end direntry
 @end format
 @end ifinfo
 
diff -urN binutils-2.12.90.0.1.org/gprof/gprof.texi binutils-2.12.90.0.1/gprof/gprof.texi
--- binutils-2.12.90.0.1.org/gprof/gprof.texi	Mon Mar 11 22:37:40 2002
+++ binutils-2.12.90.0.1/gprof/gprof.texi	Mon Mar 11 22:37:52 2002
@@ -9,9 +9,10 @@
 @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
+@dircategory Programming tools:
+@direntry
+* gprof: (gprof).			Profiling your program's execution
+@end direntry
 @end format
 @end ifinfo
 
diff -urN binutils-2.12.90.0.1.org/ld/ld.texinfo binutils-2.12.90.0.1/ld/ld.texinfo
--- binutils-2.12.90.0.1.org/ld/ld.texinfo	Mon Mar 11 22:37:41 2002
+++ binutils-2.12.90.0.1/ld/ld.texinfo	Mon Mar 11 22:37:52 2002
@@ -48,9 +48,10 @@
 
 @ifinfo
 @format
-START-INFO-DIR-ENTRY
-* Ld: (ld).                       The GNU linker.
-END-INFO-DIR-ENTRY
+@dircategory Programming tools:
+@direntry
+* Ld: (ld).				The GNU linker
+@end direntry
 @end format
 @end ifinfo
 
@@ -4590,7 +4591,7 @@
 @node BFD outline
 @section How it works: an outline of BFD
 @cindex opening object files
-@include bfdsumm.texi
+@include ../bfd/doc/bfdsumm.texi
 @end ifclear
 
 @node Reporting Bugs