diff --git a/mesa-7.11-generic-wmb.patch b/mesa-7.11-generic-wmb.patch
new file mode 100644
index 0000000..618d836
--- /dev/null
+++ b/mesa-7.11-generic-wmb.patch
@@ -0,0 +1,12 @@
+diff -up Mesa-7.11/src/mesa/drivers/dri/sis/sis_context.h.jx Mesa-7.11/src/mesa/drivers/dri/sis/sis_context.h
+--- Mesa-7.11/src/mesa/drivers/dri/sis/sis_context.h.jx	2010-12-14 16:43:15.000000000 -0500
++++ Mesa-7.11/src/mesa/drivers/dri/sis/sis_context.h	2011-09-09 11:47:56.454465358 -0400
+@@ -405,7 +405,7 @@ struct sis_context
+ #elif defined(__ia64__)
+ #define MMIO_WMB()	__asm __volatile("mf" : : : "memory")
+ #else
+-#error platform needs WMB
++#define MMIO_WMB()	__sync_synchronize()
+ #endif
+ 
+ #define mEndPrimitive()  \
diff --git a/mesa.spec b/mesa.spec
index cbff41b..3d29a5a 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -23,7 +23,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.9
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -51,6 +51,7 @@ Patch5: mesa-demos-fix-add-needed.patch
 
 Patch30: mesa-7.6-hush-vblank-warning.patch
 Patch31: mesa-7.9-i915-no-gen3-arbfs.patch
+Patch32: mesa-7.11-generic-wmb.patch
 
 BuildRequires: pkgconfig autoconf automake libtool
 %if %{with_hardware}
@@ -198,6 +199,7 @@ Group: User Interface/X Hardware Support
 #%patch7 -p1 -b .dricore
 %patch30 -p1 -b .vblank-warning
 %patch31 -p1 -b .arbfs
+%patch32 -p1 -b .wmb
 
 # Hack the demos to use installed data files
 cd ../%{demopkg}
@@ -433,6 +435,10 @@ rm -rf $RPM_BUILD_ROOT
 %{demodir}
 
 %changelog
+* Thu Sep 15 2011 Adam Jackson <ajax@redhat.com> 7.9-6
+- mesa-7.11-generic-wmb.patch: Add generic write memory barrier macro for
+  non-PC arches.
+
 * Mon Dec 20 2010 Dave Airlie <airlied@redhat.com> 7.9-5
 - fix lightspark GLSL issues + r300/r400 corrupt textures + rs690 textures