diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes
index 8f27d44..8648f81 100644
--- a/Mesa-drivers.changes
+++ b/Mesa-drivers.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Sat May 19 14:56:38 UTC 2018 - sndirsch@suse.com
+
+- Update to 18.0.4
+  * r600 driver gets a fix for constant buffer boounds, which
+    fixes rendering bugs in Trine and Witcher 1.
+  * Several fixes for RADV driver: fixes around alpha channel
+    in Pre-Vega, fix in multisample image copies, and fixes
+    around multilayer images in compute path.
+  * For the case of ANV/i965 drivers, also a couple of fixes, 
+    all of them around ISP. On top, there are a couple of fixes
+    relative to code emission around 16-bit integers, and a a
+    fix for a leak in blorp for Gen4 and Gen5.
+  * Speaking of leaks, there are also fixes for 
+    winsys/radeon/amdgpu and pipe-loader.gets a couple of patches
+    to fix a couple of leaks.
+  * SPIR-V part gets a patch to apply OriginUpperLeft to FragCoord.
+  * Mesa core gets a couple of patches to fix error handling in
+    get_framebuffer_parameteriv, and to add missing support for
+    glFogiv(GL_FOG_DISTANCE_MODE_NV).
+
 -------------------------------------------------------------------
 Tue May  8 12:14:26 UTC 2018 - sndirsch@suse.com
 
diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec
index 5113c1e..ce78e77 100644
--- a/Mesa-drivers.spec
+++ b/Mesa-drivers.spec
@@ -43,7 +43,7 @@
 
 %define glamor 1
 %define _name_archive mesa
-%define _version 18.0.3
+%define _version 18.0.4
 %define with_opencl 0
 %define with_vulkan 0
 %define with_llvm 0
@@ -113,7 +113,7 @@
 %endif
 
 Name:           Mesa-drivers
-Version:        18.0.3
+Version:        18.0.4
 Release:        0
 Summary:        System for rendering 3-D graphics
 License:        MIT
diff --git a/Mesa.changes b/Mesa.changes
index 8f27d44..8648f81 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Sat May 19 14:56:38 UTC 2018 - sndirsch@suse.com
+
+- Update to 18.0.4
+  * r600 driver gets a fix for constant buffer boounds, which
+    fixes rendering bugs in Trine and Witcher 1.
+  * Several fixes for RADV driver: fixes around alpha channel
+    in Pre-Vega, fix in multisample image copies, and fixes
+    around multilayer images in compute path.
+  * For the case of ANV/i965 drivers, also a couple of fixes, 
+    all of them around ISP. On top, there are a couple of fixes
+    relative to code emission around 16-bit integers, and a a
+    fix for a leak in blorp for Gen4 and Gen5.
+  * Speaking of leaks, there are also fixes for 
+    winsys/radeon/amdgpu and pipe-loader.gets a couple of patches
+    to fix a couple of leaks.
+  * SPIR-V part gets a patch to apply OriginUpperLeft to FragCoord.
+  * Mesa core gets a couple of patches to fix error handling in
+    get_framebuffer_parameteriv, and to add missing support for
+    glFogiv(GL_FOG_DISTANCE_MODE_NV).
+
 -------------------------------------------------------------------
 Tue May  8 12:14:26 UTC 2018 - sndirsch@suse.com
 
diff --git a/Mesa.spec b/Mesa.spec
index 57d12d0..08f1ca1 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -42,7 +42,7 @@
 
 %define glamor 1
 %define _name_archive mesa
-%define _version 18.0.3
+%define _version 18.0.4
 %define with_opencl 0
 %define with_vulkan 0
 %define with_llvm 0
@@ -112,7 +112,7 @@
 %endif
 
 Name:           Mesa
-Version:        18.0.3
+Version:        18.0.4
 Release:        0
 Summary:        System for rendering 3-D graphics
 License:        MIT
diff --git a/mesa-18.0.3.tar.xz b/mesa-18.0.3.tar.xz
deleted file mode 100644
index 3c764c9..0000000
--- a/mesa-18.0.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:099d9667327a76a61741a533f95067d76ea71a656e66b91507b3c0caf1d49e30
-size 10922936
diff --git a/mesa-18.0.3.tar.xz.sig b/mesa-18.0.3.tar.xz.sig
deleted file mode 100644
index 792686b..0000000
Binary files a/mesa-18.0.3.tar.xz.sig and /dev/null differ
diff --git a/mesa-18.0.4.tar.xz b/mesa-18.0.4.tar.xz
new file mode 100644
index 0000000..cd7e1c8
--- /dev/null
+++ b/mesa-18.0.4.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1f3bcfe7cef0a5c20dae2b41df5d7e0a985e06be0183fa4d43b6068fcba2920f
+size 10939356
diff --git a/mesa-18.0.4.tar.xz.sig b/mesa-18.0.4.tar.xz.sig
new file mode 100644
index 0000000..bc07d92
Binary files /dev/null and b/mesa-18.0.4.tar.xz.sig differ