diff --git a/Mesa.changes b/Mesa.changes
index 1fc7cea..a2c2fbf 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Sat Feb  4 14:58:43 UTC 2017 - schwab@linux-m68k.org
+
+- specfile: fix build configuration for arm, ppc and s390 platforms
+
+-------------------------------------------------------------------
+Thu Feb  2 15:28:27 UTC 2017 - sndirsch@suse.com
+
+- update to 13.0.4
+  * Multiple fixes for the i965 and radeonsi drivers. An odd glitch
+    in glxgears when using the freedreno driver was also addressed.
+  * The ANV driver being the prime source of patches - from
+    compatibility improvements with newer Vulkan loaders, 
+    smoketesting and various rendering and compliance fixes.
+  * A couple of longstanding issues in the VA state tracker have
+    also been resolved.  
+
 -------------------------------------------------------------------
 Mon Jan 30 10:01:47 UTC 2017 - sndirsch@suse.com
 
diff --git a/Mesa.spec b/Mesa.spec
index b6d08a2..fc11e6e 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -22,7 +22,7 @@
 
 %define glamor 1
 %define _name_archive mesa
-%define _version 13.0.3
+%define _version 13.0.4
 %define with_opencl 0
 %define with_vulkan 0
 %ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le s390x
@@ -30,7 +30,7 @@
 %else
 %define gallium_loader 0
 %endif
-%ifarch %ix86 x86_64 aarch64 %arm ppc ppc64 ppc64le
+%ifarch %ix86 x86_64 aarch64 %arm ppc64 ppc64le
 %define xvmc_support 1
 %define vdpau_nouveau 1
 %define vdpau_radeon 1
@@ -49,7 +49,7 @@
 %endif
 
 Name:           Mesa
-Version:        13.0.3
+Version:        13.0.4
 Release:        0
 Summary:        System for rendering interactive 3-D graphics
 License:        MIT
@@ -653,7 +653,6 @@ autoreconf -fvi
 %else
            --with-dri-searchpath=%{_libdir}/dri \
 %endif
-           --enable-xa \
            --enable-gallium-llvm \
            --enable-llvm-shared-libs \
            --enable-vdpau \
@@ -663,14 +662,17 @@ autoreconf -fvi
            --with-vulkan-drivers=intel,radeon \
 %endif
 %ifarch %ix86 x86_64
+           --enable-xa \
            --with-dri-drivers=i915,i965,nouveau,r200,radeon \
            --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl \
 %endif
 %ifarch %arm aarch64
+           --enable-xa \
            --with-dri-drivers=nouveau \
            --with-gallium-drivers=r300,r600,nouveau,swrast,svga,freedreno,vc4 \
 %endif
 %ifarch ppc64 ppc64le
+           --enable-xa \
            --with-dri-drivers=nouveau \
            --with-gallium-drivers=r300,r600,nouveau,swrast,svga \
 %endif
@@ -806,8 +808,10 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \
 %{_libdir}/dri/updates
 %endif
 %{_libdir}/dri/*_dri.so
+%ifarch %ix86 x86_64 aarch64 %arm ppc64 ppc64le
 %exclude %{_libdir}/dri/nouveau_dri.so
 %exclude %{_libdir}/dri/nouveau_vieux_dri.so
+%endif
 %if 0%{with_opencl}
 # only built with opencl
 %dir %{_libdir}/gallium-pipe/
@@ -900,7 +904,7 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \
 %{_libdir}/libgbm.so
 %{_libdir}/pkgconfig/gbm.pc
 
-%ifarch aarch64 %ix86 x86_64 %arm ppc64 ppc64le s390x
+%ifarch aarch64 %ix86 x86_64 %arm ppc64 ppc64le
 %files -n libxatracker2
 %defattr(-,root,root)
 %{_libdir}/libxatracker.so.2*
@@ -975,7 +979,7 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \
 %{_includedir}/GL/internal
 %{_libdir}/pkgconfig/dri.pc
 
-%ifarch %ix86 x86_64 aarch64 %arm ppc64 ppc64le ia64 ppc hppa
+%ifarch %ix86 x86_64 aarch64 %arm ppc64 ppc64le
 %files -n Mesa-dri-nouveau
 %{_libdir}/dri/nouveau_dri.so
 %{_libdir}/dri/nouveau_vieux_dri.so
@@ -1008,7 +1012,7 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \
 %{_libdir}/libMesaOpenCL.so*
 %endif
 
-%ifnarch s390 s390x
+%ifarch %ix86 x86_64 aarch64 %arm ppc64 ppc64le
 %files libva
 %defattr(-,root,root)
 %dir %{_libdir}/dri
diff --git a/mesa-13.0.3.tar.xz b/mesa-13.0.3.tar.xz
deleted file mode 100644
index 6d759b7..0000000
--- a/mesa-13.0.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d9aa8be5c176d00d0cd503cb2f64a5a403ea471ec819c022581414860d7ba40e
-size 9162036
diff --git a/mesa-13.0.3.tar.xz.sig b/mesa-13.0.3.tar.xz.sig
deleted file mode 100644
index 90f8c30..0000000
Binary files a/mesa-13.0.3.tar.xz.sig and /dev/null differ
diff --git a/mesa-13.0.4.tar.xz b/mesa-13.0.4.tar.xz
new file mode 100644
index 0000000..f47bd86
--- /dev/null
+++ b/mesa-13.0.4.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a95d7ce8f7bd5f88585e4be3144a341236d8c0fc91f6feaec59bb8ba3120e726
+size 9164612
diff --git a/mesa-13.0.4.tar.xz.sig b/mesa-13.0.4.tar.xz.sig
new file mode 100644
index 0000000..e8bdbeb
Binary files /dev/null and b/mesa-13.0.4.tar.xz.sig differ