diff --git a/ChangeLog b/ChangeLog
index 2f087fc59..89cfefba1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-02  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+
+	* GL/glx/glxcmds.c: (DoMakeCurrent):
+	Use {prev}glxc instead of pDraw to access pScreen.  Fixes
+	glXMakeCurrent(dpy, None, NULL).
+
 2006-02-01  Kristian Høgsberg  <krh@redhat.com>
 
 	* hw/xfree86/dri/dri.c (DRIUnlockedCallback): Also drop drawable lock.
diff --git a/GL/glx/glxcmds.c b/GL/glx/glxcmds.c
index 4eea7bc16..e2ce3e93a 100644
--- a/GL/glx/glxcmds.c
+++ b/GL/glx/glxcmds.c
@@ -618,7 +618,7 @@ int DoMakeCurrent( __GLXclientState *cl,
 	/* FIXME-KRH: this is where we need the looseContext function
 	 * in the DRIcontext interface. */
 
-	if (!(*prevglxc->driContext.unbindContext)(NULL, pDraw->pScreen->myNum,
+	if (!(*prevglxc->driContext.unbindContext)(NULL, prevglxc->pScreen->myNum,
 						   0, /* prev draw */
 						   0, /* prev read */
 						   &prevglxc->driContext)) {
@@ -631,7 +631,7 @@ int DoMakeCurrent( __GLXclientState *cl,
     if ((glxc != 0) && !glxc->isDirect) {
 
 	/* make the context current */
-	if (!(*glxc->driContext.bindContext)(NULL, pDraw->pScreen->myNum,
+	if (!(*glxc->driContext.bindContext)(NULL, glxc->pScreen->myNum,
 					     drawId, readId,
 					     &glxc->driContext)) {
 	    return __glXBadContext;