diff --git a/Mesa.changes b/Mesa.changes
index ecaba5b..709879a 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Mon Aug 28 14:17:25 UTC 2017 - mimi.vx@gmail.com
+
+- update to 17.1.8 
+ * fdo#101334 - AMD SI cards: Some vulkan apps freeze the system
+ * fdo#101766 - Assertion `!"invalid type"' failed when constant
+    expression involves literal of different type<
+ * fdo#102024 - FORMAT_FEATURE_SAMPLED_IMAGE_BIT not supported for D16_UNORM
+    and D32_SFLOAT
+ * fdo#102148 - Crash when running qopenglwidget example on mesa llvmpipe win32
+ * fdo#102241 - gallium/wgl: SwapBuffers freezing regularly with swap
+    interval enabled
+ * fdo#101910 - [BYT]
+    ES31-CTS.functional.copy_image.non_compressed.viewclass_96_bits.rgb32f_rgb32f
+  * fdo#102308 - segfault in glCompressedTextureSubImage3D
+
 -------------------------------------------------------------------
 Mon Aug 28 12:53:03 UTC 2017 - fvogt@suse.com
 
@@ -5,6 +21,7 @@ Mon Aug 28 12:53:03 UTC 2017 - fvogt@suse.com
   * n_force-xlocale-funcs.patch
 
 -------------------------------------------------------------------
+>>>>>>> ./Mesa.changes.r797cdae3a18826447fbc3669ad9416d2
 Wed Aug 23 09:01:46 UTC 2017 - sndirsch@suse.com
 
 - u_llvmpipe-lp_build_gather_elem_vec-BE-fix-for-3x16-lo.patch
diff --git a/Mesa.spec b/Mesa.spec
index 2c300c3..b06d574 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -22,7 +22,7 @@
 %endif
 %define glamor 1
 %define _name_archive mesa
-%define _version 17.1.6
+%define _version 17.1.8
 %define with_opencl 0
 %define with_vulkan 0
 %ifarch %ix86 x86_64 %arm aarch64 ppc ppc64 ppc64le s390x
diff --git a/mesa-17.1.6.tar.xz b/mesa-17.1.6.tar.xz
deleted file mode 100644
index 836e431..0000000
--- a/mesa-17.1.6.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0686deadde1f126b20aa67e47e8c50502043eee4ecdf60d5009ffda3cebfee50
-size 9868932
diff --git a/mesa-17.1.6.tar.xz.sig b/mesa-17.1.6.tar.xz.sig
deleted file mode 100644
index e32df76..0000000
Binary files a/mesa-17.1.6.tar.xz.sig and /dev/null differ
diff --git a/mesa-17.1.8.tar.xz b/mesa-17.1.8.tar.xz
new file mode 100644
index 0000000..fa10b8c
--- /dev/null
+++ b/mesa-17.1.8.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:75ed2eaeae26ddd536150f294386468ae2e1a7717948c41cd14b7875be5269db
+size 9902800
diff --git a/mesa-17.1.8.tar.xz.sig b/mesa-17.1.8.tar.xz.sig
new file mode 100644
index 0000000..f67a861
Binary files /dev/null and b/mesa-17.1.8.tar.xz.sig differ