diff --git a/gdbserver_tests-update-filters-for-newer-glibc-gdb.patch b/gdbserver_tests-update-filters-for-newer-glibc-gdb.patch
new file mode 100644
index 0000000..e09698f
--- /dev/null
+++ b/gdbserver_tests-update-filters-for-newer-glibc-gdb.patch
@@ -0,0 +1,41 @@
+From 6da22a4d246519cd1a638cfc7eff00cdd74413c4 Mon Sep 17 00:00:00 2001
+From: Mark Wielaard <mark@klomp.org>
+Date: Fri, 16 Jul 2021 21:37:21 +0200
+Subject: [PATCH] gdbserver_tests: update filters for newer glibc/gdb
+
+With newer glibc/gdb we might see a __select call without anything
+following on the line. Also when gdb cannot find a file it might
+now print "Inappropriate ioctl for device" instead of the message
+"No such file or directory"
+---
+ gdbserver_tests/filter_gdb  | 1 +
+ gdbserver_tests/filter_vgdb | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/gdbserver_tests/filter_gdb b/gdbserver_tests/filter_gdb
+index 3bcd26d86..4a5b5d7a5 100755
+--- a/gdbserver_tests/filter_gdb
++++ b/gdbserver_tests/filter_gdb
+@@ -111,6 +111,7 @@ s/\(0x........\) in ?? ()$/\1 in syscall .../
+ #         If select.c sources are present, we can also get a line containing:
+ #              return SYSCALL_CANCEL....
+ s/in __select .*/in syscall .../
++s/in __select$/in syscall .../
+ /exceptfds/d
+ /sysv\/linux\/select\.c/d
+ /return SYSCALL_CANCEL /d
+diff --git a/gdbserver_tests/filter_vgdb b/gdbserver_tests/filter_vgdb
+index f8028a39a..679ca4b31 100755
+--- a/gdbserver_tests/filter_vgdb
++++ b/gdbserver_tests/filter_vgdb
+@@ -18,6 +18,7 @@ sed -e '/relaying data between gdb and process/d'                        \
+     
+ # filter some debuginfo problems with ld.so and SLES11
+ sed -e '/^1	rtld.c: No such file or directory\./d' |
++sed -e '/rtld.c: Inappropriate ioctl for device\./d' |
+ 
+ # and filter out any remaining empty lines
+ sed -e '/^$/d'
+-- 
+2.27.0
+
diff --git a/valgrind.spec b/valgrind.spec
index e3c696c..06a97be 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -149,6 +149,10 @@ Patch12: valgrind-3.17.0-s390-z15.patch
 # s390x: Don't emit "vector or with complement" on z13
 Patch13: valgrind-3.17.0-s390-z13-vec-fix.patch
 
+# commit 6da22a4d246519cd1a638cfc7eff00cdd74413c4
+# gdbserver_tests: update filters for newer glibc/gdb
+Patch14: gdbserver_tests-update-filters-for-newer-glibc-gdb.patch
+
 BuildRequires: make
 BuildRequires: glibc-devel
 
@@ -302,6 +306,8 @@ touch memcheck/tests/s390x/vistr.stdout.exp
 %patch12 -p1
 %patch13 -p1
 
+%patch14 -p1
+
 %build
 # LTO triggers undefined symbols in valgrind.  Valgrind has a --enable-lto
 # configure time option, but that doesn't seem to help.
@@ -526,6 +532,9 @@ fi
 %endif
 
 %changelog
+* Sat Jul 17 2021 Mark Wielaard <mjw@fedoraproject.org>
+- Add gdbserver_tests-update-filters-for-newer-glibc-gdb.patch
+
 * Fri Jul  9 2021 Mark Wielaard <mjw@fedoraproject.org> - 3.17.0-6
 - Update to include fixed CI gating tests.