diff --git a/mesa-6.5.2-bindcontext-paranoia.patch b/mesa-6.5.2-bindcontext-paranoia.patch
new file mode 100644
index 0000000..9ea40db
--- /dev/null
+++ b/mesa-6.5.2-bindcontext-paranoia.patch
@@ -0,0 +1,11 @@
+--- Mesa-6.5.2/src/mesa/drivers/dri/common/dri_util.c.jx	2006-12-02 13:14:16.000000000 -0500
++++ Mesa-6.5.2/src/mesa/drivers/dri/common/dri_util.c	2007-04-04 12:41:08.000000000 -0400
+@@ -271,6 +271,8 @@
+     __DRIdrawablePrivate *prp;
+     __DRIcontextPrivate * const pcp = ctx->private;
+ 
++    if (!pcp)
++	return GL_FALSE;
+ 
+     /* Find the _DRIdrawable which corresponds to the writing drawable. */
+     pdraw = __driFindDrawable(psp->drawHash, draw);
diff --git a/mesa.spec b/mesa.spec
index 8165eb1..68f034f 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -31,7 +31,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.5.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -49,6 +49,7 @@ Patch19: mesa-6.5.2-r300-parallel-build.patch
 Patch20: mesa-6.5.2-libgl-visibility.patch
 Patch21: mesa-6.5.2-picify-dri-drivers.patch
 Patch22: mesa-6.5.2-hush-synthetic-visual-warning.patch
+Patch23: mesa-6.5.2-bindcontext-paranoia.patch
 
 BuildRequires: pkgconfig
 %if %{with_dri}
@@ -165,6 +166,7 @@ The glx-utils package provides the glxinfo and glxgears utilities.
 %patch20 -p1 -b .libgl-visibility
 %patch21 -p1 -b .picify
 %patch22 -p1 -b .visual-warning
+%patch23 -p1 -b .bindcontext
 
 # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
 # license and are not open source/free software, so we remove them.
@@ -334,6 +336,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/glxinfo
 
 %changelog
+* Wed Apr 04 2007 Adam Jackson <ajax@redhat.com> 6.5.2-9
+- mesa-6.5.2-bindcontext-paranoia.patch: Paper over a crash when doBindContext
+  fails, to avoid, for example, crashing the server when using tdfx but
+  without glide3 installed.
+
 * Thu Mar 08 2007 Adam Jackson <ajax@redhat.com> 6.5.2-8
 - Hush the (useless) warning about the synthetic visual not being supported.