diff --git a/ChangeLog b/ChangeLog
index 009dbdea62..f241c1fa6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1998-11-19  Geoff Keating  <geoffk@ozemail.com.au>
+
+	* elf/rtld.c (_dl_start): Handle weak undefined symbols in ld.so
+	correctly.
+
 1998-11-19  Ulrich Drepper  <drepper@cygnus.com>
 
 	* misc/error.c: Undo last change.
diff --git a/elf/rtld.c b/elf/rtld.c
index b88e1e12b0..38c7b051b1 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -132,7 +132,8 @@ _dl_start (void *arg)
   /* This #define produces dynamic linking inline functions for
      bootstrap relocation instead of general-purpose relocation.  */
 #define RTLD_BOOTSTRAP
-#define RESOLVE(sym, version, flags) bootstrap_map.l_addr
+#define RESOLVE(sym, version, flags) \
+  ((*(sym))->st_shndx == SHN_UNDEF ? 0 : bootstrap_map.l_addr)
 #include "dynamic-link.h"
 
   /* Figure out the run-time load address of the dynamic linker itself.  */