diff --git a/Mesa.changes b/Mesa.changes
index 5ecc891..dace372 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Aug  8 13:40:55 UTC 2013 - schwab@suse.de
+
+- Don't enable gallium-egl without Gallium
+- Enable llvm_r600 only on %ix86 x86_64
+
 -------------------------------------------------------------------
 Mon Jul 29 12:55:23 UTC 2013 - sndirsch@suse.com
 
diff --git a/Mesa.spec b/Mesa.spec
index 65c2e00..a10aa85 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -17,9 +17,15 @@
 
 
 %define glamor 1
+%ifnarch s390 s390x aarch64
+# Requires non-empty --with-gallium-drivers
 %define egl_gallium 1
+%else
+%define egl_gallium 0
+%endif
+%ifarch %ix86 x86_64
 %define llvm_r600 1
-%ifarch ppc ppc64
+%else
 %define llvm_r600 0 
 %endif
 
@@ -512,7 +518,6 @@ This package contains the VDPAU state tracker for R600. This is
 still "work in progress", i.e. expect poor video quality, choppy
 videos and artefacts all over.
 
-%if %llvm_r600
 %package -n libvdpau_radeonsi
 Summary:        XVMC state tracker for radeonsi
 Group:          System/Libraries
@@ -521,7 +526,6 @@ Group:          System/Libraries
 This package contains the VDPAU state tracker for radeonsi. This is
 still "work in progress", i.e. expect poor video quality, choppy
 videos and artefacts all over.
-%endif
 
 %package -n libvdpau_softpipe
 Summary:        Software implementation of XVMC state tracker