diff --git a/mesa.spec b/mesa.spec
index c5f5a71..981e5c6 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -7,9 +7,11 @@
 %define with_hardware 0
 %define dri_drivers --with-dri-drivers=swrast
 %else
-# llvm support only works on some arches
-%ifarch %{ix86} x86_64 ppc ppc64 ppc64p7 %{arm}
+# llvm support only works on some arches (ppc back off for the moment)
+%ifarch %{ix86} x86_64 %{arm}
 %define with_llvm 1
+%else
+%define swrastc ,swrast
 %endif
 %define with_hardware 1
 %define base_drivers nouveau,radeon,r200
@@ -24,7 +26,7 @@
 %ifarch ia64
 %define platform_drivers ,i915
 %endif
-%define dri_drivers --with-dri-drivers=%{base_drivers}%{?platform_drivers}
+%define dri_drivers --with-dri-drivers=%{base_drivers}%{?platform_drivers}%{?swrastc}
 %endif
 
 %define _default_patch_fuzz 2
@@ -36,7 +38,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 9.0
-Release: 0.1%{?dist}
+Release: 0.2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -322,11 +324,10 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
     --enable-gallium-llvm \
     --with-llvm-shared-libs \
 %else
-    --with-gallium-drivers=%{?with_vmware:svga,}r300,r600,nouveau,swrast \
+    --with-gallium-drivers=%{?with_vmware:svga,}r300,r600,nouveau \
 %endif
 %else
     --disable-gallium-llvm \
-    --with-gallium-drivers=swrast \
     --enable-dri \
 %endif
     %{?dri_drivers}
@@ -590,6 +591,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Sep 24 2012 Adam Jackson <ajax@redhat.com> 9.0-0.2
+- Switch to swrast classic instead of softpipe for non-llvm arches
+- Re-disable llvm on ppc until it can draw pixels
+
 * Mon Sep 24 2012 Dave Airlie <airlied@redhat.com> 9.0-0.1
 - rebase to latest upstream 9.0 pre-release branch
 - add back glu from new upstream (split for f18 later)