diff --git a/Mesa.changes b/Mesa.changes
index d4bba93..ecaba5b 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+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..2c300c3 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -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/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"
+