diff --git a/ChangeLog b/ChangeLog
index b7fc3b37b6..3a58dab765 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-05  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	* configure.ac:
+	Explicitely link with -ldl if dladdr() is found there. Before it was
+	implicitely linked by the gmodule pkgconfig file but in glib 2.17.0
+	-ldl has moved from Libs to Libs.private. Fixes bug #536744.
+
 2008-06-05  Tim-Philipp Müller  <tim.muller at collabora co uk>
 
 	* gst/gsterror.c: (_gst_stream_errors_init):
diff --git a/configure.ac b/configure.ac
index 18f5ee9a20..fcb01b26ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -454,8 +454,8 @@ dnl test if we have dladdr(); we use it for debugging; see gst/gstinfo.c
 save_cflags="$CFLAGS"
 CFLAGS="$CFLAGS -D_GNU_SOURCE"
 AC_CHECK_LIB(dl, dladdr,
-   AC_DEFINE(HAVE_DLADDR, 1,
-             [Defined if we have dladdr ()]))
+   AC_DEFINE(HAVE_DLADDR, 1, [Defined if we have dladdr ()])
+   LIBS="$LIBS -ldl")
 CFLAGS="$save_cflags"
 
 dnl check for inet_aton()