diff --git a/glibc-2.34567-NPTL-helgrind.supp b/glibc-2.34567-NPTL-helgrind.supp
index d8943df..d73b888 100644
--- a/glibc-2.34567-NPTL-helgrind.supp
+++ b/glibc-2.34567-NPTL-helgrind.supp
@@ -12,22 +12,9 @@
    helgrind-glibc2X-001
    Helgrind:Race
    obj:/lib*/ld-2.*so*
-   obj:/lib*/ld-2.*so*
 }
-{
-   helgrind-glibc2X-002
-   Helgrind:Race
-   obj:/lib*/ld-2.*so*
-   obj:/lib*/libc-2.*so*
-   obj:/lib*/ld-2.*so*
-}
-{
-   helgrind-glibc2X-003
-   Helgrind:Race
-   obj:/lib*/ld-2.*so*
-   obj:/lib*/libc-2.*so*
-   obj:/lib*/libc-2.*so*
-}
+# helgrind-glibc2X-002 was merged into helgrind-glibc2X-001
+# helgrind-glibc2X-003 was merged into helgrind-glibc2X-001
 {
    helgrind-glibc2X-004
    Helgrind:Race
@@ -48,13 +35,7 @@
    obj:/lib*/libpthread-2.*so*
    obj:/lib*/libc-2.*so*
 }
-{
-   helgrind-glibc2X-007
-   Helgrind:Race
-   obj:/lib*/ld-2.*so*
-   obj:/lib*/libc-2.*so*
-   obj:/lib*/libdl-2.*so*
-}
+# helgrind-glibc2X-007 was merged into helgrind-glibc2X-001
 {
    helgrind-glibc2X-008
    Helgrind:Race
@@ -68,39 +49,16 @@
    fun:*
    obj:/lib*/libc-2.*so*
 }
-{
-   helgrind-glibc2X-010
-   Helgrind:Race
-   obj:/lib*/ld-2.*so*
-   obj:/lib*/libpthread-2.*so*
-}
+# helgrind-glibc2X-010 was merged into helgrind-glibc2X-001
 {
    helgrind-glibc2X-011
    Helgrind:Race
    obj:/lib*/libc-2.*so*
    obj:/lib*/libpthread-2.*so*
 }
-{
-   helgrind-glibc2X-012
-   Helgrind:Race
-   obj:/lib*/ld-2.*so*
-   obj:/lib*/ld-2.*so*
-   obj:/lib*/libc-2.*so*
-}
-{
-   helgrind-glibc2X-013
-   Helgrind:Race
-   obj:/lib*/ld-2.*so*
-   fun:*
-   obj:/lib*/ld-2.*so*
-}
-{
-   helgrind-glibc2X-014
-   Helgrind:Race
-   obj:/lib*/ld-2.*so*
-   obj:/lib*/ld-2.*so*
-   obj:/lib*/libpthread-2.*so*
-}
+# helgrind-glibc2X-012 was merged into helgrind-glibc2X-001
+# helgrind-glibc2X-013 was merged into helgrind-glibc2X-001
+# helgrind-glibc2X-014 was merged into helgrind-glibc2X-001
 {
    helgrind-glibc2X-015
    Helgrind:Race
@@ -293,10 +251,4 @@
 ####################################################
 # To do with dynamic linking
 #
-{
-   helgrind---ld.so-...-dlsym
-   Helgrind:Race
-   obj:/lib*/ld-2.*so*
-   ...
-   fun:dlsym
-}
+# helgrind---ld.so-...-dlsym was merged into helgrind-glibc2X-001