diff --git a/mesa-7.8.3-fdo30220.patch b/mesa-7.8.3-fdo30220.patch
new file mode 100644
index 0000000..d176170
--- /dev/null
+++ b/mesa-7.8.3-fdo30220.patch
@@ -0,0 +1,11 @@
+--- Mesa-7.8.3-rc1.old/src/glx/glxcmds.c	2010-09-16 03:14:45.074000414 -0400
++++ Mesa-7.8.3-rc1.new/src/glx/glxcmds.c	2010-09-17 05:39:19.715000033 -0400
+@@ -103,7 +103,7 @@
+    if (__glxHashFirst(sc->drawHash, &draw, (void *) &pdraw) == 1) {
+       do {
+          windowExistsFlag = GL_TRUE;
+-         XGetWindowAttributes(dpy, draw, &xwa); /* dummy request */
++         XGetWindowAttributes(dpy, pdraw->xDrawable, &xwa); /* dummy request */
+          if (!windowExistsFlag) {
+             /* Destroy the local drawable data, if the drawable no
+                longer exists in the Xserver */
diff --git a/mesa.spec b/mesa.spec
index 817f504..c327bed 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -21,7 +21,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.8.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -52,6 +52,10 @@ Patch31: mesa-7.8.1-intel-dri2-damage.patch
 Patch32: radeon-fix-glCopyTex-Sub-Image-if-user-FBO-is-bound.patch
 Patch33: Mark-MESA_swap_control-and-SGI_video_sync-as-not-dir.patch
 
+# "Change windowExistsErrorHandler to drawableExistsErrorHandler in glxcmds.c"
+# https://bugs.freedesktop.org/show_bug.cgi?id=30220
+Patch50: mesa-7.8.3-fdo30220.patch 
+
 BuildRequires: pkgconfig autoconf automake
 %if %{with_hardware}
 BuildRequires: kernel-headers >= 2.6.27-0.305.rc5.git6
@@ -202,6 +206,7 @@ Group: User Interface/X Hardware Support
 # http://lists.freedesktop.org/archives/mesa-dev/2010-April/000389.html
 %patch33 -p1 -b .direct-only-extensions
 
+%patch50 -p1 -b .fdo30220
 
 # Hack the demos to use installed data files
 
@@ -418,6 +423,10 @@ rm -rf $RPM_BUILD_ROOT
 %{demodir}
 
 %changelog
+* Mon Oct 04 2010 Rex Dieter <rdieter@fedoraproject.org> - 7.8.1-9
+- Change windowExistsErrorHandler to drawableExistsErrorHandler in glxcmds.c (#30220)
+- kwin freezes when changing related settings in systemsettings while compositing is active (#625894)
+
 * Thu Aug 05 2010 Ben Skeggs <bskeggs@redhat.com> - 7.8.1-8
 - glx regression fix from upstream (rhbz#601631)