diff --git a/ChangeLog b/ChangeLog
index 4e96cb283..5a7bacd60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-24  Kristian Høgsberg  <krh@redhat.com>
+
+	* GL/glx/glxdri.c (__glXDRIscreenProbe): Make sure DRI module is
+	loaded before calling DRI functions.
+
 2006-03-23  Alan Coopersmith  <alan.coopersmith@sun.com>
 
 	* hw/xfree86/getconfig/getconfig.pl: 
diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c
index 9e5c6b019..385a8fab8 100644
--- a/GL/glx/glxdri.c
+++ b/GL/glx/glxdri.c
@@ -724,6 +724,11 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
     char filename[128];
     Bool isCapable;
 
+    if (dlsym (NULL, "DRIQueryDirectRenderingCapable") == NULL) {
+	LogMessage(X_ERROR, "AIGLX: DRI module not loaded\n");
+	return NULL;
+    }
+
     if (!DRIQueryDirectRenderingCapable(pScreen, &isCapable) || !isCapable) {
 	LogMessage(X_ERROR,
 		   "AIGLX: Screen %d is not DRI capable\n", pScreen->myNum);