diff --git a/mesa3d/.md5sum b/mesa3d/.md5sum
index 3cccf745..e5a7755d 100644
--- a/mesa3d/.md5sum
+++ b/mesa3d/.md5sum
@@ -1,2 +1,3 @@
 0f2794baf7a9d98b22caea9f78c6942d  MesaDemos-6.5.1.tar.bz2
 c46f2c6646a270911b791dd8e1c2d977  MesaLib-6.5.1.tar.bz2
+5c5c9197cb3ceb7d8598314bdea1581b  mesa3d.diff
diff --git a/mesa3d/Pkgfile b/mesa3d/Pkgfile
index 6e238573..d222e323 100644
--- a/mesa3d/Pkgfile
+++ b/mesa3d/Pkgfile
@@ -5,12 +5,15 @@
 
 name=mesa3d
 version=6.5.1
-release=2
-source=(http://dl.sourceforge.net/$name/Mesa{Lib,Demos}-$version.tar.bz2)
+release=3
+source=(http://dl.sourceforge.net/$name/Mesa{Lib,Demos}-$version.tar.bz2 \
+        $name.diff)
 
 build() {
 	cd Mesa-$version
 
+	patch -Np1 -i $SRC/$name.diff
+
 	cat <<EOF >> configs/linux-dri
 INSTALL_DIR = $PKG/usr
 DRI_DRIVER_INSTALL_DIR = $PKG/usr/lib/dri
diff --git a/mesa3d/mesa3d.diff b/mesa3d/mesa3d.diff
new file mode 100644
index 00000000..3e167665
--- /dev/null
+++ b/mesa3d/mesa3d.diff
@@ -0,0 +1,16 @@
+diff -aur Mesa-6.5.1.orig/src/glx/x11/glxext.c Mesa-6.5.1/src/glx/x11/glxext.c
+--- Mesa-6.5.1.orig/src/glx/x11/glxext.c	2006-08-29 23:45:28.000000000 +0200
++++ Mesa-6.5.1/src/glx/x11/glxext.c	2006-11-29 18:01:03.219605180 +0100
+@@ -1016,11 +1016,11 @@
+ 	if (!_XReply(dpy, (xReply*) &reply, 0, False)) {
+ 	    /* Something is busted. Punt. */
+ 	    UnlockDisplay(dpy);
++	    SyncHandle();
+ 	    FreeScreenConfigs(priv);
+ 	    return GL_FALSE;
+ 	}
+ 
+-	UnlockDisplay(dpy);
+ 	if (!reply.numVisuals) {
+ 	    /* This screen does not support GL rendering */
+ 	    UnlockDisplay(dpy);