diff --git a/glibc-build-time.patch b/glibc-build-time.patch
new file mode 100644
index 0000000..987d909
--- /dev/null
+++ b/glibc-build-time.patch
@@ -0,0 +1,22 @@
+Various patches to improve build time.
+
+commit e07eca6a72d21a5a37ba33df7b126609db048c41
+Author: Florian Weimer <fweimer@redhat.com>
+Date:   Wed Aug 17 16:14:02 2016 +0200
+
+    nptl/tst-once5: Reduce time to expected failure
+    
+    (cherry picked from commit 1f645571d2db9008b3cd3d5acb9ff93357864283)
+
+diff --git a/nptl/tst-once5.cc b/nptl/tst-once5.cc
+index 60bc78a..a6985b0 100644
+--- a/nptl/tst-once5.cc
++++ b/nptl/tst-once5.cc
+@@ -76,5 +76,7 @@ do_test (void)
+   return result;
+ }
+ 
++// The test currently hangs and is XFAILed.  Reduce the timeout.
++#define TIMEOUT 1
+ #define TEST_FUNCTION do_test ()
+ #include "../test-skeleton.c"
diff --git a/glibc.spec b/glibc.spec
index 80c2bc3..6ae027f 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
 %define glibcsrcdir  glibc-2.22
 %define glibcversion 2.22
-%define glibcrelease 17%{?dist}
+%define glibcrelease 18%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -270,6 +270,7 @@ Patch1049: glibc-rh1282011.patch
 Patch1050: glibc-rh1337140.patch
 Patch1051: glibc-rh1326903.patch
 Patch1052: glibc-rh1337291.patch
+Patch1053: glibc-build-time.patch
 
 ##############################################################################
 #
@@ -739,6 +740,7 @@ microbenchmark tests on the system.
 %patch1050 -p1
 %patch1051 -p1
 %patch1052 -p1
+%patch1053 -p1
 %patch0059 -p1
 
 ##############################################################################
@@ -1959,6 +1961,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Thu Aug 18 2016 Florian Weimer <fweimer@redhat.com> - 2.22-18
+- Build time improvements
+
 * Thu Jun  2 2016 Florian Weimer <fweimer@redhat.com> - 2.22-17
 - CVE-2016-4429: stack overflow in Sun RPC clntudp_call (#1337140)
 - Fix fork redirection in libpthread (#1326903)