diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 21932c54e0..136fdab968 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-11  Philip Blundell  <philb@gnu.org>
+
+	* elf32-arm.h (elf32_arm_finish_dynamic_symbol): Don't make PLT
+	entries that could serve as a definition for a weak symbol.
+
 2001-03-08  Nick Clifton  <nickc@redhat.com>
 
 	* Most files: Update copyright notices using Perl script created
diff --git a/bfd/elf32-arm.h b/bfd/elf32-arm.h
index 9129b8e444..58edefea21 100644
--- a/bfd/elf32-arm.h
+++ b/bfd/elf32-arm.h
@@ -3197,6 +3197,13 @@ elf32_arm_finish_dynamic_symbol (output_bfd, info, h, sym)
 	  /* Mark the symbol as undefined, rather than as defined in
 	     the .plt section.  Leave the value alone.  */
 	  sym->st_shndx = SHN_UNDEF;
+	  /* If the symbol is weak, we do need to clear the value.
+	     Otherwise, the PLT entry would provide a definition for
+	     the symbol even if the symbol wasn't defined anywhere,
+	     and so the symbol would never be NULL.  */
+	  if ((h->elf_link_hash_flags & ELF_LINK_HASH_REF_REGULAR_NONWEAK)
+	      == 0)
+	    sym->st_value = 0;
 	}
     }