diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 6b3c567fb5..84405e1c39 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-15  Alan Modra  <amodra@bigpond.net.au>
+
+	PR ld/815
+	* elflink.c (elf_smash_syms): Clear undef.next if it's not being
+	used as a list pointer.
+
 2005-04-14  Alan Modra  <amodra@bigpond.net.au>
 
 	* Makefile.am (NO_WERROR): Define.
diff --git a/bfd/elflink.c b/bfd/elflink.c
index 09d06167fa..017ebe436a 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -2935,8 +2935,11 @@ elf_smash_syms (struct elf_link_hash_entry *h, void *data)
   if (h->ref_regular)
     abort ();
 
-  /* Set sym back to newly created state, but keep undefs list pointer.  */
+  /* Set sym back to newly created state, but keep undef.next if it is
+     being used as a list pointer.  */
   bh = h->root.u.undef.next;
+  if (bh == &h->root)
+    bh = NULL;
   if (bh != NULL || inf->htab->root.undefs_tail == &h->root)
     inf->twiddled = TRUE;
   (*inf->htab->root.table.newfunc) (&h->root.root,