diff --git a/ChangeLog b/ChangeLog
index bb88dbcd0..812bc98b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-18  Kristian Høgsberg  <krh@redhat.com>
+
+	* GL/glx/glxext.c (ClientGone): Also lift DRI lock when destroying
+	context from ClientGone callback.
+
 2006-01-17  Kristian Høgsberg  <krh@redhat.com>
 
 	* GL/Makefile.am:
diff --git a/GL/glx/glxext.c b/GL/glx/glxext.c
index 3c6da6947..4857c0b78 100644
--- a/GL/glx/glxext.c
+++ b/GL/glx/glxext.c
@@ -129,7 +129,7 @@ static int ClientGone(int clientIndex, XID id)
 		__glXDeassociateContext(cx);
 		cx->isCurrent = GL_FALSE;
 		if (!cx->idExists) {
-		    __glXFreeContext(cx);
+		  DRIUnlockedCallback(__glXFreeContext, cx, 0);
 		}
 	    }
 	}