diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f179847bad..c4df452b07 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,35 @@
+2001-12-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd.c (struct _bfd): Add section_htab, section_tail.
+	* libbfd-in.h (_bfd_delete_bfd): Declare.
+	(bfd_section_hash_newfunc): Declare.
+	* opncls.c (_bfd_new_bfd): Free memory on failure.  Init
+	section_htab and section_tail.
+	(_bfd_delete_bfd): New function.
+	(bfd_openr): Use it.
+	(bfd_fdopenr): Likewise.
+	(bfd_openstreamr): Likewise.
+	(bfd_openw): Likewise.
+	(bfd_close): Likewise.
+	(bfd_close_all_done): Likewise.
+	(bfd_release): Comment.
+	* section.c (struct section_hash_entry): New.
+	(bfd_section_hash_newfunc): New function.
+	(section_hash_lookup): Define.
+	(bfd_section_init): New function, split out from
+	bfd_make_section_anyway.
+	(bfd_get_section_by_name): Lookup via hash table.
+	(bfd_get_unique_section_name): Likewise.
+	(bfd_make_section_old_way): Rewrite to use hash table.
+	(bfd_make_section_anyway): Likewise.
+	(bfd_make_section): Likewise.  Return NULL for attempts to make
+	BFD_{ABS,COM,UND,IND}_SECTION_NAME.
+	(_bfd_strip_section_from_output): Adjust section_tail if needed.
+	* configure.in: Bump bfd version.
+	* configure: Regenerate.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+
 2001-12-15  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
 
 	* elf64-mips.c (mips_elf64_link_hash_entry): New link hash.
diff --git a/ld/ChangeLog b/ld/ChangeLog
index cb83b83e07..06278a6514 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,13 @@
+2001-12-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* emultempl/elf32.em (gld${EMULATION_NAME}_place_orphan): Adjust
+	section_tail when fiddling with section list.
+	(gld${EMULATION_NAME}_list_options): Ensure sentences aren't
+	broken into separate strings to make translation easier.
+	* emultempl/mmo.em (mmo_place_orphan): Adjust section_tail when
+	fiddling with section list.
+	* emultempl/pe.em (gld_${EMULATION_NAME}_place_orphan): Likewise.
+
 2001-12-16  Hans-Peter Nilsson  <hp@bitrange.com>
 
 	* scripttempl/mmo.sc: Add .debug_ranges to listed sections.