diff --git a/srcpkgs/chroot-glibc/template b/srcpkgs/chroot-glibc/template
index cc3075ef5b..a486b39447 100644
--- a/srcpkgs/chroot-glibc/template
+++ b/srcpkgs/chroot-glibc/template
@@ -3,7 +3,7 @@ pkgname=chroot-glibc
 _majorver=2.18
 version=${_majorver}
 wrksrc="glibc-${version}"
-revision=1
+revision=2
 short_desc="The GNU C library - for xbps-src use"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/libc"
diff --git a/srcpkgs/glibc/patches/arch-glibc-2.18-strstr-hackfix.patch b/srcpkgs/glibc/patches/arch-glibc-2.18-strstr-hackfix.patch
new file mode 100644
index 0000000000..558de0825b
--- /dev/null
+++ b/srcpkgs/glibc/patches/arch-glibc-2.18-strstr-hackfix.patch
@@ -0,0 +1,12 @@
+--- sysdeps/x86_64/multiarch/strstr.c
++++ sysdeps/x86_64/multiarch/strstr.c
+@@ -86,7 +86,7 @@
+ /* Simple replacement of movdqu to address 4KB boundary cross issue.
+    If EOS occurs within less than 16B before 4KB boundary, we don't
+    cross to next page.  */
+-static __m128i
++static inline __m128i
+ __m128i_strloadu (const unsigned char * p, __m128i zero)
+ {
+   if (__builtin_expect ((int) ((size_t) p & 0xfff) > 0xff0, 0))
+
diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index 848da71b57..9ca30eb862 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -1,7 +1,7 @@
 # Template file for 'glibc'
 pkgname=glibc
 version=2.18
-revision=2
+revision=3
 short_desc="The GNU C library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/libc"