diff --git a/Mesa.changes b/Mesa.changes
index d4bba93..e20161e 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+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
+
+- Add patch to fix strtod on non-EN locale (boo#1055929):
+  * n_force-xlocale-funcs.patch
+
 -------------------------------------------------------------------
 Wed Aug 23 09:01:46 UTC 2017 - sndirsch@suse.com
 
diff --git a/Mesa.spec b/Mesa.spec
index f334f2e..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
@@ -81,6 +81,8 @@ Patch15:        u_mesa-8.0-llvmpipe-shmget.patch
 Patch18:        n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch
 # never to be upstreamed
 Patch21:        n_Define-GLAPIVAR-separate-from-GLAPI.patch
+# never to be upstreamed
+Patch22:        n_force-xlocale-funcs.patch
 # currently needed for libglvnd support
 Patch31:        archlinux_0001-Fix-linkage-against-shared-glapi.patch
 Patch32:        archlinux_glvnd-fix-gl-dot-pc.patch
@@ -652,6 +654,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 %patch12 -p1
 %patch18 -p1
 %patch21 -p1
+%patch22 -p1
 
 %if 0%{?libglvnd}
 %patch31 -p1
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
diff --git a/n_force-xlocale-funcs.patch b/n_force-xlocale-funcs.patch
new file mode 100644
index 0000000..c5f205e
--- /dev/null
+++ b/n_force-xlocale-funcs.patch
@@ -0,0 +1,27 @@
+From: Fabian Vogt <fvogt@suse.com>
+Subject: Force use of strtod_l and friends
+Patch-mainline: never
+References: boo#1055929
+
+With glibc 2.26, xlocale.h got removed, but the used functions
+are available as part of local.h since POSIX2008, so use them
+unconditionally.
+This is necessary to fix strod with non-EN locales.
+
+Index: mesa-17.1.6/src/util/strtod.c
+===================================================================
+--- mesa-17.1.6.orig/src/util/strtod.c
++++ mesa-17.1.6/src/util/strtod.c
+@@ -28,11 +28,9 @@
+ 
+ #ifdef _GNU_SOURCE
+ #include <locale.h>
+-#ifdef HAVE_XLOCALE_H
+-#include <xlocale.h>
++#define HAVE_XLOCALE_H
+ static locale_t loc;
+ #endif
+-#endif
+ 
+ #include "strtod.h"
+