diff --git a/glibc.spec b/glibc.spec
index b526edd..87f0ca5 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
-%define glibcsrcdir glibc-2.26.9000-911-g7863a71181
+%define glibcsrcdir glibc-2.26.9000-936-g37ac8e635a
 %define glibcversion 2.26.9000
-%define glibcrelease 30%{?dist}
+%define glibcrelease 31%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -58,15 +58,6 @@
 # to provide a more optimized version of the package for your arch.
 %define auxarches athlon alphaev6
 ##############################################################################
-# Enable lock elision support for these architectures
-#
-# At the moment lock elision is disabled on x86_64 until there's a CPU that
-# would actually benefit from enabling it.  Intel released a microcode update
-# to disable HLE and RTM at boot and the Fedora kernel now applies it early
-# enough that keeping lock elision enabled should be harmless, but we have
-# disabled it anyway as a conservative measure.
-%define lock_elision_arches s390 s390x
-##############################################################################
 # We support only 64-bit POWER with the following runtimes:
 # 64-bit BE:
 # - Power 620 / 970 ISA (default runtime, compatile with POWER4 and newer)
@@ -955,9 +946,6 @@ build()
 %ifarch %{ix86}
 		--disable-multi-arch \
 %endif
-%ifarch %{lock_elision_arches}
-		--enable-lock-elision \
-%endif
 %if %{without werror}
 		--disable-werror \
 %endif
@@ -2120,6 +2108,20 @@ fi
 %endif
 
 %changelog
+* Wed Dec 06 2017 Florian Weimer <fweimer@redhat.com> - 2.26.9000-31
+- Add elision tunables.  Drop related configure flag.
+- Auto-sync with upstream branch master,
+  commit 37ac8e635a29810318f6d79902102e2e96b2b5bf:
+- Linux: Implement interfaces for memory protection keys
+- math: Add _Float64, _Float32x function aliases
+- math: Use sign as double for reduced case in sinf
+- math: fix sinf(NAN)
+- math: s_sinf.c: Replace floor with simple casts
+- et_EE locale: Base collation on iso14651_t1 (swbz#22517)
+- tr_TR locale: Base collation on iso14651_t1 (swbz#22527)
+- hr_HR locale: Avoid single code points for digraphs in LC_TIME (swbz#10580)
+- S390: Fix backtrace in vdso functions
+
 * Mon Dec 04 2017 Florian Weimer <fweimer@redhat.com> - 2.26.9000-30
 - Add build dependency on bison
 - Auto-sync with upstream branch master,
diff --git a/sources b/sources
index beb9e50..034a7a9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glibc-2.26.9000-911-g7863a71181.tar.gz) = 3f4a684e7185ec394d706096d2a1ac7468a5a9c98c76790065967d5c9a71514063d011c7384f962633b4c41ee9110f1f1c54e10f541f1b74fb13c0e6bc37bf28
+SHA512 (glibc-2.26.9000-936-g37ac8e635a.tar.gz) = 871e9846882421a25ea128049330af3dde437b410f85afd3be8657ad893cba7d72718bd72905272bb3d2ce3f20c757dbeb4e8f2be3c0574e1840a04b755a4832