diff --git a/glibc-linux-timespec-header-compat.patch b/glibc-linux-timespec-header-compat.patch
new file mode 100644
index 0000000..c3ef322
--- /dev/null
+++ b/glibc-linux-timespec-header-compat.patch
@@ -0,0 +1,28 @@
+commit 371fd753b278a5ca5e8f3233f585f6b2826b0a3b
+Author: Florian Weimer <fweimer@redhat.com>
+Date:   Thu Jun 21 08:18:15 2018 +0200
+
+    time: Define _STRUCT_TIMESPEC in <bits/types/struct_timespec.h>
+    
+    After commit d76d3703551a362b472c866b5b6089f66f8daa8e ("Fix missing
+    timespec definition for sys/stat.h (BZ #21371)"), sanitizer builds start
+    to fail due to a conflicting definition of struct timespec in
+    <linux/time.h>.  Define _STRUCT_TIMESPEC, which is already checked in
+    the kernel header, to support including <linux/time.h> after
+    <sys/stat.h>.
+
+diff --git a/time/bits/types/struct_timespec.h b/time/bits/types/struct_timespec.h
+index 644db9fdb6206291..bde7e2826d839e77 100644
+--- a/time/bits/types/struct_timespec.h
++++ b/time/bits/types/struct_timespec.h
+@@ -1,6 +1,10 @@
+ #ifndef __timespec_defined
+ #define __timespec_defined 1
+ 
++#ifndef _STRUCT_TIMESPEC
++# define _STRUCT_TIMESPEC 1
++#endif
++
+ #include <bits/types.h>
+ 
+ /* POSIX.1b structure for a time value.  This is like a `struct timeval' but
diff --git a/glibc.spec b/glibc.spec
index 1522183..f0b5200 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
 %define glibcsrcdir glibc-2.27.9000-497-gf496b28e61
 %define glibcversion 2.27.9000
-%define glibcrelease 26%{?dist}
+%define glibcrelease 27%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -160,6 +160,7 @@ Patch0018: glibc-c-utf8-locale.patch
 Patch0019: glibc-rh1315108.patch
 Patch0022: glibc-deprecate_libcrypt.patch
 Patch23: glibc-python3.patch
+Patch24: glibc-linux-timespec-header-compat.patch
 
 ##############################################################################
 # Continued list of core "glibc" package information:
@@ -1857,6 +1858,9 @@ fi
 %endif
 
 %changelog
+* Thu Jun 21 2018 Florian Weimer <fweimer@redhat.com> - 2.27.9000-27
+- Compatibility fix for <sys/stat.h> and <linux/time.h>
+
 * Thu Jun 21 2018 Florian Weimer <fweimer@redhat.com> - 2.27.9000-26
 - Auto-sync with upstream branch master,
   commit f496b28e61d0342f579bf794c71b80e9c7d0b1b5.