diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index a1c9e8c1af..4430b5c2ef 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf.c (_bfd_elf_close_and_cleanup): Only call
+	_bfd_dwarf2_cleanup_debug_info on bfd_object.
+
 2005-05-05  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* elflink.c (_bfd_elf_provide_section_bound_symbols): Use
@@ -145,7 +150,7 @@
 	(_bfd_dwarf2_cleanup_debug_info): New function:  Frees memory
 	allocated by functions in this file.
 	* elf-bfd.h (_bfd_dwarf2_cleanup_debug_info): Prototype.
-	* elf.c (bfd_elf_close_and_cleanup): Call
+	* elf.c (_bfd_elf_close_and_cleanup): Call
 	_bfd_dwarf2_cleanup_debug_info.
 
 2005-05-05  Hans-Peter Nilsson  <hp@axis.com>
diff --git a/bfd/elf.c b/bfd/elf.c
index 6ba2cb86f4..7f402c3cb3 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -6683,10 +6683,9 @@ _bfd_elf_close_and_cleanup (bfd *abfd)
     {
       if (elf_shstrtab (abfd) != NULL)
 	_bfd_elf_strtab_free (elf_shstrtab (abfd));
+      _bfd_dwarf2_cleanup_debug_info (abfd);
     }
 
-  _bfd_dwarf2_cleanup_debug_info (abfd);
-
   return _bfd_generic_close_and_cleanup (abfd);
 }