diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes
index 6d5213f..049d2da 100644
--- a/Mesa-drivers.changes
+++ b/Mesa-drivers.changes
@@ -1,3 +1,43 @@
+-------------------------------------------------------------------
+Wed Mar 28 09:24:25 UTC 2018 - sndirsch@suse.com
+
+- Update to 18.0.0 final
+  * one-and-only change since 18.0.0-rc5: updated release notes
+- Changes since 17.3  
+  * The top highlights include:
+    + Cannonlake support on i965 and anv
+    + GL 4.3/GLES 3.1 support  on r600/evergreen with hw fp64 support
+    + Meson build system
+  * ANV Extensions:
+    + VK_EXT_external_memory_dma_buf
+  * RADV Extensions:
+    + VK_ANDROID_native_buffer
+    + VK_KHR_external_fence
+    + VK_KHR_external_fence_capabilities
+    + VK_KHR_external_fence_fd
+    + VK_KHR_get_surface_capabilities2
+    + VK_EXT_discard_rectangles
+    + VK_EXT_external_memory_dma_buf
+    + VK_AMD_shader_info
+  * EGL:
+    + Support for RGBA/RGBX 1010102 formats
+    + EGL_EXT_pixel_format_float
+    + Final planned release to ship wayland-egl. Now provided by wayland.
+  * GLX:
+    + Darwin/Apple fixes
+  * Mesa core
+    + Support 1 binary format for GL_ARB_get_program_binary on i965
+    + drirc workarounds:
+      (*) Unreal 4 Editor
+      (*) Observer
+      (*) Steamroll
+      (*) Refunct
+  * drirc mesa_glthread whitelists:
+    + Mount and Blade Warband
+- i965:
+  * Disk shader cache when MESA_GLSL_CACHE_DISABLE is set to "false"
+  * GL_EXT_disjoint_timer_query on gen6+
+
 -------------------------------------------------------------------
 Wed Mar 21 15:06:52 UTC 2018 - sndirsch@suse.com
 
diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec
index 2486234..74f41ed 100644
--- a/Mesa-drivers.spec
+++ b/Mesa-drivers.spec
@@ -43,7 +43,7 @@
 
 %define glamor 1
 %define _name_archive mesa
-%define _version 18.0.0-rc5
+%define _version 18.0.0
 %define with_opencl 0
 %define with_vulkan 0
 %define with_llvm 0
diff --git a/Mesa.changes b/Mesa.changes
index 6d5213f..049d2da 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,43 @@
+-------------------------------------------------------------------
+Wed Mar 28 09:24:25 UTC 2018 - sndirsch@suse.com
+
+- Update to 18.0.0 final
+  * one-and-only change since 18.0.0-rc5: updated release notes
+- Changes since 17.3  
+  * The top highlights include:
+    + Cannonlake support on i965 and anv
+    + GL 4.3/GLES 3.1 support  on r600/evergreen with hw fp64 support
+    + Meson build system
+  * ANV Extensions:
+    + VK_EXT_external_memory_dma_buf
+  * RADV Extensions:
+    + VK_ANDROID_native_buffer
+    + VK_KHR_external_fence
+    + VK_KHR_external_fence_capabilities
+    + VK_KHR_external_fence_fd
+    + VK_KHR_get_surface_capabilities2
+    + VK_EXT_discard_rectangles
+    + VK_EXT_external_memory_dma_buf
+    + VK_AMD_shader_info
+  * EGL:
+    + Support for RGBA/RGBX 1010102 formats
+    + EGL_EXT_pixel_format_float
+    + Final planned release to ship wayland-egl. Now provided by wayland.
+  * GLX:
+    + Darwin/Apple fixes
+  * Mesa core
+    + Support 1 binary format for GL_ARB_get_program_binary on i965
+    + drirc workarounds:
+      (*) Unreal 4 Editor
+      (*) Observer
+      (*) Steamroll
+      (*) Refunct
+  * drirc mesa_glthread whitelists:
+    + Mount and Blade Warband
+- i965:
+  * Disk shader cache when MESA_GLSL_CACHE_DISABLE is set to "false"
+  * GL_EXT_disjoint_timer_query on gen6+
+
 -------------------------------------------------------------------
 Wed Mar 21 15:06:52 UTC 2018 - sndirsch@suse.com
 
diff --git a/Mesa.spec b/Mesa.spec
index 5db0abf..762180c 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -42,7 +42,7 @@
 
 %define glamor 1
 %define _name_archive mesa
-%define _version 18.0.0-rc5
+%define _version 18.0.0
 %define with_opencl 0
 %define with_vulkan 0
 %define with_llvm 0
diff --git a/mesa-18.0.0-rc5.tar.xz b/mesa-18.0.0-rc5.tar.xz
deleted file mode 100644
index 728778e..0000000
--- a/mesa-18.0.0-rc5.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a4e0c559e06157b4f2c184c51133d8c224eb39d296985f662b43868eed0c20d0
-size 10970572
diff --git a/mesa-18.0.0-rc5.tar.xz.sig b/mesa-18.0.0-rc5.tar.xz.sig
deleted file mode 100644
index d0f55b1..0000000
Binary files a/mesa-18.0.0-rc5.tar.xz.sig and /dev/null differ
diff --git a/mesa-18.0.0.tar.xz b/mesa-18.0.0.tar.xz
new file mode 100644
index 0000000..aea4691
--- /dev/null
+++ b/mesa-18.0.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:694e5c3d37717d23258c1f88bc134223c5d1aac70518d2f9134d6df3ee791eea
+size 11056544
diff --git a/mesa-18.0.0.tar.xz.sig b/mesa-18.0.0.tar.xz.sig
new file mode 100644
index 0000000..53a2cff
Binary files /dev/null and b/mesa-18.0.0.tar.xz.sig differ