diff --git a/Mesa.changes b/Mesa.changes
index e6583f3..5dae495 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan  6 14:00:51 UTC 2016 - schwab@suse.de
+
+- Enable swrast gallium driver on s390/aarch64
+- Exclude Mesa-libva on s390/s390x/aarch64
+
 -------------------------------------------------------------------
 Sun Dec 20 05:03:08 UTC 2015 - jimmy@boombatower.com
 
diff --git a/Mesa.spec b/Mesa.spec
index 11fb451..b26efc6 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package Mesa
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -618,7 +618,7 @@ autoreconf -fvi
 %endif
 %ifarch s390 aarch64
            --with-dri-drivers=swrast \
-           --with-gallium-drivers="" \
+           --with-gallium-drivers=swrast \
 %endif
 %ifarch s390x
         --enable-xa \
@@ -938,9 +938,11 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \
 %{_libdir}/libMesaOpenCL.so*
 %endif
 
+%ifnarch s390 s390x aarch64
 %files libva
 %defattr(-,root,root)
 %dir %{_libdir}/dri
 %{_libdir}/dri/*_drv_video.so
+%endif
 
 %changelog