diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes
index 2059249..dad066e 100644
--- a/Mesa-drivers.changes
+++ b/Mesa-drivers.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Jan  8 14:44:46 UTC 2018 - msrb@suse.com
+
+- Update to 17.3.1
+  * Multiple fixes and improvements of the GLSL shader cache. The
+    RADV driver no longer advertises VK_EXT_debug_report - there is
+    no support for it.
+  * The i965, radeonsi, nvc0 and freedreno drivers have received a
+    few small fixes each.
+  * A number of big endian fixes have been merged.
+
 -------------------------------------------------------------------
 Thu Jan  8 14:26:50 UTC 2018 - tchvatal@suse.com
 
diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec
index c4af1e2..e025802 100644
--- a/Mesa-drivers.spec
+++ b/Mesa-drivers.spec
@@ -43,7 +43,7 @@
 
 %define glamor 1
 %define _name_archive mesa
-%define _version 17.3.0
+%define _version 17.3.1
 %define with_opencl 0
 %define with_vulkan 0
 %define with_llvm 0
@@ -108,7 +108,7 @@
 %endif
 
 Name:           Mesa-drivers
-Version:        17.3.0
+Version:        17.3.1
 Release:        0
 Summary:        System for rendering interactive 3-D graphics
 License:        MIT
diff --git a/Mesa.changes b/Mesa.changes
index 2059249..dad066e 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Jan  8 14:44:46 UTC 2018 - msrb@suse.com
+
+- Update to 17.3.1
+  * Multiple fixes and improvements of the GLSL shader cache. The
+    RADV driver no longer advertises VK_EXT_debug_report - there is
+    no support for it.
+  * The i965, radeonsi, nvc0 and freedreno drivers have received a
+    few small fixes each.
+  * A number of big endian fixes have been merged.
+
 -------------------------------------------------------------------
 Thu Jan  8 14:26:50 UTC 2018 - tchvatal@suse.com
 
diff --git a/Mesa.spec b/Mesa.spec
index 15213b7..7e63061 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -42,7 +42,7 @@
 
 %define glamor 1
 %define _name_archive mesa
-%define _version 17.3.0
+%define _version 17.3.1
 %define with_opencl 0
 %define with_vulkan 0
 %define with_llvm 0
@@ -107,7 +107,7 @@
 %endif
 
 Name:           Mesa
-Version:        17.3.0
+Version:        17.3.1
 Release:        0
 Summary:        System for rendering interactive 3-D graphics
 License:        MIT
diff --git a/baselibs.conf b/baselibs.conf
index 0b34314..b483f77 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,4 +1,7 @@
 Mesa
+	# Include this configuration file in every arch version of Mesa, so we
+	# get dummy Mesa-<targettype> that other arch packages can supplement it.
+	+/etc/drirc
 	obsoletes "XFree86-Mesa-<targettype> xorg-x11-Mesa-<targettype>"
 	provides  "XFree86-Mesa-<targettype> xorg-x11-Mesa-<targettype>"
 	provides "Mesa-libIndirectGL1-<targettype> = <version>"
@@ -28,7 +31,7 @@ Mesa-libEGL-devel
 	requires "Mesa-libEGL1-<targettype> = <version>"
 	requires "libglvnd-devel-<targettype> >= 0.1.0"
 Mesa-libGL1
-	requires "Mesa-<targettype>"
+	requires "Mesa-<targettype> = <version>"
 	requires "libglvnd-<targettype> >= 0.1.0"
 Mesa-libGL-devel
 	requires "Mesa-libGL1-<targettype> = <version>"
@@ -100,4 +103,6 @@ libvdpau_radeonsi
 libwayland-egl1
 Mesa-dri-nouveau
 Mesa-dri
+	supplements "Mesa-<targettype> = <version>"
 Mesa-gallium
+	supplements "Mesa-<targettype> = <version>"
diff --git a/mesa-17.3.0.tar.xz b/mesa-17.3.0.tar.xz
deleted file mode 100644
index 1e0a2cc..0000000
--- a/mesa-17.3.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:29a0a3a6c39990d491a1a58ed5c692e596b3bfc6c01d0b45e0b787116c50c6d9
-size 10667896
diff --git a/mesa-17.3.0.tar.xz.sig b/mesa-17.3.0.tar.xz.sig
deleted file mode 100644
index b3cf10b..0000000
Binary files a/mesa-17.3.0.tar.xz.sig and /dev/null differ
diff --git a/mesa-17.3.1.tar.xz b/mesa-17.3.1.tar.xz
new file mode 100644
index 0000000..59f59fc
--- /dev/null
+++ b/mesa-17.3.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9ae607e0998a586fb2c866cfc8e45e6f52d1c56cb1b41288253ea83eada824c1
+size 10669392
diff --git a/mesa-17.3.1.tar.xz.sig b/mesa-17.3.1.tar.xz.sig
new file mode 100644
index 0000000..cff4791
Binary files /dev/null and b/mesa-17.3.1.tar.xz.sig differ