diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 9fdfdd8aa3..b46f869116 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,16 @@
+2005-10-04  Bob Wilson  <bob.wilson@acm.org>
+
+	* archive.c: Add missing SUBSECTION for documentation.
+	* bfd.c: Likewise.
+	* cache.c: Likewise.
+	* corefile.c: Likewise.
+	* format.c: Likewise.
+	* init.c: Likewise.
+	* libbfd.c: Likewise.
+	* opncls.c: Likewise.
+	* elf.c: Remove blank line after SECTION heading.
+	* reloc.c: Change "howto manager" SECTION to a SUBSECTION.
+
 2005-10-04  Nick Clifton  <nickc@redhat.com>
 
 	* elf32-arm.c (get_arm_elf_section_data): Cache the last pointer
diff --git a/bfd/archive.c b/bfd/archive.c
index a4b392917b..5a12f01f7c 100644
--- a/bfd/archive.c
+++ b/bfd/archive.c
@@ -74,6 +74,8 @@ DESCRIPTION
 
 	Archives are supported in BFD in <<archive.c>>.
 
+SUBSECTION
+	Archive functions
 */
 
 /* Assumes:
diff --git a/bfd/bfd.c b/bfd/bfd.c
index c8be7396cc..3783ccfc39 100644
--- a/bfd/bfd.c
+++ b/bfd/bfd.c
@@ -626,7 +626,10 @@ bfd_get_error_handler (void)
 
 /*
 SECTION
-	Symbols
+	Miscellaneous
+
+SUBSECTION
+	Miscellaneous functions
 */
 
 /*
diff --git a/bfd/cache.c b/bfd/cache.c
index 33850b68bb..e2524fbf15 100644
--- a/bfd/cache.c
+++ b/bfd/cache.c
@@ -36,6 +36,8 @@ SECTION
 	close, closes it and opens the one wanted, returning its file
 	handle.
 
+SUBSECTION
+	Caching functions
 */
 
 #include "bfd.h"
diff --git a/bfd/corefile.c b/bfd/corefile.c
index f9ece647e1..adc5b4ac88 100644
--- a/bfd/corefile.c
+++ b/bfd/corefile.c
@@ -23,6 +23,9 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 SECTION
 	Core files
 
+SUBSECTION
+	Core file functions
+
 DESCRIPTION
 	These are functions pertaining to core files.
 */
diff --git a/bfd/elf.c b/bfd/elf.c
index b1b73a02f4..435622d219 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -19,8 +19,8 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-/*  SECTION
-
+/*
+SECTION
 	ELF backends
 
 	BFD support for ELF formats is being worked on.
diff --git a/bfd/format.c b/bfd/format.c
index 4ccca2a3aa..ba9ca9f609 100644
--- a/bfd/format.c
+++ b/bfd/format.c
@@ -38,6 +38,8 @@ SECTION
 
 	The BFD contains the result of an executable core dump.
 
+SUBSECTION
+	File format functions
 */
 
 #include "bfd.h"
diff --git a/bfd/init.c b/bfd/init.c
index 232902af7a..a34acbf9fa 100644
--- a/bfd/init.c
+++ b/bfd/init.c
@@ -27,6 +27,9 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 SECTION
 	Initialization
 
+SUBSECTION
+	Initialization functions
+
 	These are the functions that handle initializing a BFD.
 */
 
diff --git a/bfd/libbfd.c b/bfd/libbfd.c
index df41787c08..66137bb610 100644
--- a/bfd/libbfd.c
+++ b/bfd/libbfd.c
@@ -30,6 +30,9 @@
 
 /*
 SECTION
+	Implementation details
+
+SUBSECTION
 	Internal functions
 
 DESCRIPTION
diff --git a/bfd/opncls.c b/bfd/opncls.c
index c5cc252c66..68a2f3cd11 100644
--- a/bfd/opncls.c
+++ b/bfd/opncls.c
@@ -124,6 +124,8 @@ _bfd_delete_bfd (bfd *abfd)
 SECTION
 	Opening and closing BFDs
 
+SUBSECTION
+	Functions for opening and closing
 */
 
 /*
diff --git a/bfd/reloc.c b/bfd/reloc.c
index 8566d59456..ba8e14c7a4 100644
--- a/bfd/reloc.c
+++ b/bfd/reloc.c
@@ -1581,7 +1581,7 @@ DOCDD
 INODE
 	howto manager,  , typedef arelent, Relocations
 
-SECTION
+SUBSECTION
 	The howto manager
 
 	When an application wants to create a relocation, but doesn't