diff --git a/valgrind-3.8.1-index-supp.patch b/valgrind-3.8.1-index-supp.patch
new file mode 100644
index 0000000..454fca6
--- /dev/null
+++ b/valgrind-3.8.1-index-supp.patch
@@ -0,0 +1,16 @@
+--- valgrind-3.8.1.orig/glibc-2.X.supp.in	2013-09-24 23:40:41.371195878 +0200
++++ valgrind-3.8.1/glibc-2.X.supp.in	2013-09-26 21:30:44.232589496 +0200
+@@ -133,6 +133,13 @@
+    fun:expand_dynamic_string_token
+ }
+ {
++# https://bugzilla.redhat.com/show_bug.cgi?id=1011713
++   glibc-2.18.90-on-Fedora-21-index-expand
++   Memcheck:Value8
++   fun:index
++   fun:expand_dynamic_string_token
++}
++{
+    glibc-2.5.5-on-SuSE-10.2-(PPC)-2c
+    Memcheck:Addr4
+    fun:index
diff --git a/valgrind.spec b/valgrind.spec
index 4fecbf9..3dfaa06 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -3,7 +3,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: %{?scl_prefix}valgrind
 Version: 3.8.1
-Release: 29%{?dist}
+Release: 30%{?dist}
 Epoch: 1
 License: GPLv2
 URL: http://www.valgrind.org/
@@ -194,6 +194,10 @@ Patch50: valgrind-3.8.1-mmxext.patch
 # KDE#316503 Implement SSE4 MOVNTDQA insn.
 Patch51: valgrind-3.8.1-movntdqa.patch
 
+# rhbz#1011713  valgrind finds errors in index (workaround till 3.9.0)
+Patch52: valgrind-3.8.1-index-supp.patch
+
+
 %ifarch x86_64 ppc64
 # Ensure glibc{,-devel} is installed for both multilib arches
 BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
@@ -345,6 +349,7 @@ chmod 755 tests/check_isa-2_07_cap
 %patch49 -p1
 %patch50 -p1
 %patch51 -p1
+%patch52 -p1
 
 # These tests go into an endless loop on ARM
 # There is a __sync_add_and_fetch in the testcase.
@@ -508,6 +513,9 @@ echo ===============END TESTING===============
 %endif
 
 %changelog
+* Thu Sep 26 2013 Mark Wielaard <mjw@redhat.com> - 3.8.1-30
+- Add valgrind-3.8.1-index-supp.patch (#1011713)
+
 * Wed Sep 25 2013 Mark Wielaard <mjw@redhat.com> - 3.8.1-29
 - Filter out -mcpu= so tests are compiled with the right flags. (#996927).