diff --git a/mesa.spec b/mesa.spec
index 2ecf295..5176c56 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -7,8 +7,8 @@
 %define with_hardware 0
 %define dri_drivers --with-dri-drivers=swrast
 %else
-# llvm has some serious issues on PPC*, disable usage
-%ifnarch ppc ppc64 ppc64p7
+# llvm is a joke on non-x86
+%ifarch %{ix86} x86_64
 %define with_llvm 1
 %endif
 %define with_hardware 1
@@ -36,7 +36,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 8.1
-Release: 0.6%{?dist}
+Release: 0.7%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -572,6 +572,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Jun 07 2012 Adam Jackson <ajax@redhat.com> 8.1-0.7
+- Disable llvm on non-x86 (#829020)
+
 * Sun Jun 03 2012 Dave Airlie <airlied@redhat.com> 8.1-0.6
 - rebase to git master + build on top of llvm 3.1