diff --git a/ChangeLog b/ChangeLog
index b6ba434db..1843ec6b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-01  Eric Anholt  <anholt@FreeBSD.org>
+
+	reviewed by: keithp
+
+	* GL/glx/glxdri.c: (__glXDRIscreenProbe):
+	Use RTLD_DEFAULT, rather than relying on NULL happening to map to it as
+	it does on Linux.
+
 2006-04-01  Adam Jackson  <ajax@freedesktop.org>
 
 	* configure.ac:
diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c
index 385a8fab8..d70273a20 100644
--- a/GL/glx/glxdri.c
+++ b/GL/glx/glxdri.c
@@ -724,7 +724,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
     char filename[128];
     Bool isCapable;
 
-    if (dlsym (NULL, "DRIQueryDirectRenderingCapable") == NULL) {
+    if (dlsym (RTLD_DEFAULT, "DRIQueryDirectRenderingCapable") == NULL) {
 	LogMessage(X_ERROR, "AIGLX: DRI module not loaded\n");
 	return NULL;
     }