diff --git a/valgrind-3.18.1-gdbserver_tests-hwcap.patch b/valgrind-3.18.1-gdbserver_tests-hwcap.patch
new file mode 100644
index 0000000..2d952cd
--- /dev/null
+++ b/valgrind-3.18.1-gdbserver_tests-hwcap.patch
@@ -0,0 +1,25 @@
+commit 64ab89162906d5b9e2de6c3afe476fec861ef7ec
+Author: Mark Wielaard <mark@klomp.org>
+Date:   Tue Nov 2 14:27:45 2021 +0100
+
+    gdbserver_tests: Filter out glibc hwcaps libc.so
+    
+    On some systems the gdbserver_tests would fail because the filter
+    for the optimized hwcaps subdir didn't match because the file is
+    called slightly differently, with the version number before .so
+    instead of after. For example: /lib64/glibc-hwcaps/power9/libc-2.28.so
+    
+    Add one extra filter for this pattern.
+
+diff --git a/gdbserver_tests/filter_gdb.in b/gdbserver_tests/filter_gdb.in
+index d0c94f3f1..b753e0168 100755
+--- a/gdbserver_tests/filter_gdb.in
++++ b/gdbserver_tests/filter_gdb.in
+@@ -134,6 +134,7 @@ s/in \(.__\)\{0,1\}select () from \/.*$/in syscall .../
+ /^   from \/lib\/libc.so.*$/d
+ /^   from \/lib64\/libc.so.*$/d
+ /^   from \/lib64\/.*\/libc.so.*$/d
++/^   from \/lib64\/.*\/libc-.*.so/d
+ 
+ #       and yet another (gdb 7.0 way) to get a system call
+ s/in select ()$/in syscall .../
diff --git a/valgrind.spec b/valgrind.spec
index f140424..bdf267b 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -101,6 +101,10 @@ Patch8: valgrind-3.18.1-ppc64-lxsibzx-lxsihzx.patch
 Patch9: valgrind-3.18.1-ppc-pstq.patch
 Patch10: valgrind-3.18.1-ppc-pstq-tests.patch
 
+# commit 64ab89162906d5b9e2de6c3afe476fec861ef7ec
+# gdbserver_tests: Filter out glibc hwcaps libc.so
+Patch11: valgrind-3.18.1-gdbserver_tests-hwcap.patch
+
 BuildRequires: make
 BuildRequires: glibc-devel
 
@@ -243,6 +247,7 @@ Valgrind User Manual for details.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
 # LTO triggers undefined symbols in valgrind.  Valgrind has a --enable-lto
@@ -475,6 +480,7 @@ fi
 * Wed Nov 17 2021 Mark Wielaard <mjw@fedoraproject.org>
 - Add valgrind-3.18.1-ppc-pstq.patch
 - Add valgrind-3.18.1-ppc-pstq-tests.patch
+- Add valgrind-3.18.1-gdbserver_tests-hwcap.patch
 
 * Mon Nov  1 2021 Mark Wielaard <mjw@fedoraproject.org> - 3.18.1-2
 - Add valgrind-3.18.1-dhat-tests-copy.patch