diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 21e8a9288b..72eaad8bf7 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* linker.c (_bfd_link_hash_newfunc): Set all local fields.
+
 2005-02-03  Alan Modra  <amodra@bigpond.net.au>
 
 	* linker.c (_bfd_generic_link_add_one_symbol): Set u.undef.weak.
diff --git a/bfd/linker.c b/bfd/linker.c
index 5868b955d1..f940d321bd 100644
--- a/bfd/linker.c
+++ b/bfd/linker.c
@@ -455,7 +455,9 @@ _bfd_link_hash_newfunc (struct bfd_hash_entry *entry,
 
       /* Initialize the local fields.  */
       h->type = bfd_link_hash_new;
-      h->u.undef.next = NULL;
+      memset (&h->u.undef.next, 0,
+	      (sizeof (struct bfd_link_hash_entry)
+	       - offsetof (struct bfd_link_hash_entry, u.undef.next)));
     }
 
   return entry;