diff --git a/ChangeLog b/ChangeLog
index d87e9221a3..1ef00a8e21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-09  Jes Sorensen  <jes@linuxcare.com>
+
+	* elf/dl-libc.c (__libc_dlsym): Use DL_SYMBOL_ADDRESS() to obtain
+	the address of a symbol so function pointers are handled properly.
+
 2000-06-08  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/i386/Dist: Add bp-asm.h.
diff --git a/elf/dl-libc.c b/elf/dl-libc.c
index 07aae9c8f9..c95935ff75 100644
--- a/elf/dl-libc.c
+++ b/elf/dl-libc.c
@@ -111,7 +111,7 @@ __libc_dlsym (void *__map, const char *__name)
   args.name = __name;
 
   return (dlerror_run (do_dlsym, &args) ? NULL
-	  : (void *) (args.loadbase + args.ref->st_value));
+	  : (void *) (DL_SYMBOL_ADDRESS (args.loadbase, args.ref)));
 }
 
 int