diff --git a/ld/ChangeLog b/ld/ChangeLog
index 096d1fefc70..997b6f25b05 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-09  David O'Brien  <obrien@FreeBSD.org>
+
+	* emultempl/elf32.em: Do not assuming that contents of the buffer
+	returned from basename function will remain unchanged accross other
+	function calls.
+
 2001-07-03  H.J. Lu  <hjl@gnu.org>
 
 	* scripttempl/elf.sc (DYNAMIC_PAD): Revert the change made on
diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index 4e31b227fb7..a3e08c11982 100644
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -360,6 +360,9 @@ cat >>e${EMULATION_NAME}.c <<EOF
      DT_NEEDED entry for this file.  */
   bfd_elf_set_dt_needed_name (abfd, "");
 
+  /* Previos basename call was clobbered in lang_for_each_input_file.  */
+  soname = basename (abfd->filename);
+
   /* Tell the ELF backend that the output file needs a DT_NEEDED
      entry for this file if it is used to resolve the reference in
      a regular object.  */