diff --git a/glibc-2.3456-NPTL-helgrind.supp b/glibc-2.3456-NPTL-helgrind.supp
index fd6df20..a653cdc 100644
--- a/glibc-2.3456-NPTL-helgrind.supp
+++ b/glibc-2.3456-NPTL-helgrind.supp
@@ -10,88 +10,88 @@
 {
    helgrind-glibc25-001
    Helgrind:Race
-   obj:/lib*/ld-2.5.so
-   obj:/lib*/ld-2.5.so
+   obj:/lib*/ld-2.5.*so
+   obj:/lib*/ld-2.5.*so
 }
 {
    helgrind-glibc25-002
    Helgrind:Race
-   obj:/lib*/ld-2.5.so
-   obj:/lib*/libc-2.5.so
-   obj:/lib*/ld-2.5.so
+   obj:/lib*/ld-2.5.*so
+   obj:/lib*/libc-2.5.*so
+   obj:/lib*/ld-2.5.*so
 }
 {
    helgrind-glibc25-003
    Helgrind:Race
-   obj:/lib*/ld-2.5.so
-   obj:/lib*/libc-2.5.so
-   obj:/lib*/libc-2.5.so
+   obj:/lib*/ld-2.5.*so
+   obj:/lib*/libc-2.5.*so
+   obj:/lib*/libc-2.5.*so
 }
 {
    helgrind-glibc25-004
    Helgrind:Race
-   obj:/lib*/libc-2.5.so
-   obj:/lib*/libc-2.5.so
+   obj:/lib*/libc-2.5.*so
+   obj:/lib*/libc-2.5.*so
 }
 {
    helgrind-glibc25-005
    Helgrind:Race
-   obj:/lib*/libpthread-2.5.so
-   obj:/lib*/libpthread-2.5.so
-   obj:/lib*/libpthread-2.5.so
+   obj:/lib*/libpthread-2.5.*so
+   obj:/lib*/libpthread-2.5.*so
+   obj:/lib*/libpthread-2.5.*so
 }
 {
    helgrind-glibc25-006
    Helgrind:Race
-   obj:/lib*/libpthread-2.5.so
-   obj:/lib*/libpthread-2.5.so
-   obj:/lib*/libc-2.5.so
+   obj:/lib*/libpthread-2.5.*so
+   obj:/lib*/libpthread-2.5.*so
+   obj:/lib*/libc-2.5.*so
 }
 {
    helgrind-glibc25-007
    Helgrind:Race
-   obj:/lib*/ld-2.5.so
-   obj:/lib*/libc-2.5.so
-   obj:/lib*/libdl-2.5.so
+   obj:/lib*/ld-2.5.*so
+   obj:/lib*/libc-2.5.*so
+   obj:/lib*/libdl-2.5.*so
 }
 {
    helgrind-glibc25-008
    Helgrind:Race
-   obj:/lib*/libpthread-2.5.so
-   obj:/lib*/libc-2.5.so
+   obj:/lib*/libpthread-2.5.*so
+   obj:/lib*/libc-2.5.*so
 }
 {
    helgrind-glibc25-009
    Helgrind:Race
-   obj:/lib*/libc-2.5.so
+   obj:/lib*/libc-2.5.*so
    fun:*
-   obj:/lib*/libc-2.5.so
+   obj:/lib*/libc-2.5.*so
 }
 {
    helgrind-glibc25-010
    Helgrind:Race
-   obj:/lib*/ld-2.5.so
-   obj:/lib*/libpthread-2.5.so
+   obj:/lib*/ld-2.5.*so
+   obj:/lib*/libpthread-2.5.*so
 }
 {
    helgrind-glibc25-011
    Helgrind:Race
-   obj:/lib*/libc-2.5.so
-   obj:/lib*/libpthread-2.5.so
+   obj:/lib*/libc-2.5.*so
+   obj:/lib*/libpthread-2.5.*so
 }
 {
    helgrind-glibc25-013
    Helgrind:Race
-   obj:/lib*/ld-2.5.so
+   obj:/lib*/ld-2.5.*so
    fun:*
-   obj:/lib*/ld-2.5.so
+   obj:/lib*/ld-2.5.*so
 }
 {
    helgrind-glibc25-014
    Helgrind:Race
-   obj:/lib*/ld-2.5.so
-   obj:/lib*/ld-2.5.so
-   obj:/lib*/libpthread-2.5.so
+   obj:/lib*/ld-2.5.*so
+   obj:/lib*/ld-2.5.*so
+   obj:/lib*/libpthread-2.5.*so
 }
 
 # These are very ugly.  They are needed to suppress errors inside (eg)
@@ -104,14 +104,14 @@
 {
    helgrind-glibc25-101
    Helgrind:Race
-   obj:/lib*/libpthread-2.5.so
+   obj:/lib*/libpthread-2.5.*so
    fun:pthread_*
 }
 {
    helgrind-glibc25-102
    Helgrind:Race
    fun:mythread_wrapper
-   obj:/lib*/libpthread-2.5.so
+   obj:/lib*/libpthread-2.5.*so
 }
 {
    helgrind-glibc25-103
@@ -128,72 +128,88 @@
    Helgrind:Race
    fun:pthread_rwlock_*lock*
 }
+{
+   helgrind-glibc25-107
+   Helgrind:Race
+   obj:/lib*/libpthread-2.5.*so
+   fun:sem_*
+}
+{
+   helgrind-glibc25-108
+   Helgrind:Race
+   fun:clone
+}
+{
+   helgrind-glibc25-109
+   Helgrind:Race
+   fun:start_thread
+}
 
 ######------------ glibc-2.4 specific ------------######
 #
 {
    helgrind-glibc24-001
    Helgrind:Race
-   obj:/lib*/ld-2.4.so
-   obj:/lib*/ld-2.4.so
+   obj:/lib*/ld-2.4.*so
+   obj:/lib*/ld-2.4.*so
 }
 {
    helgrind-glibc24-003
    Helgrind:Race
-   obj:/lib*/ld-2.4.so
-   obj:/lib*/libc-2.4.so
-   obj:/lib*/libc-2.4.so
+   obj:/lib*/ld-2.4.*so
+   obj:/lib*/libc-2.4.*so
+   obj:/lib*/libc-2.4.*so
 }
 {
    helgrind-glibc24-004
    Helgrind:Race
-   obj:/lib*/libc-2.4.so
-   obj:/lib*/libc-2.4.so
+   obj:/lib*/libc-2.4.*so
+   obj:/lib*/libc-2.4.*so
 }
 {
    helgrind-glibc24-005
    Helgrind:Race
-   obj:/lib*/libpthread-2.4.so
-   obj:/lib*/libpthread-2.4.so
-   obj:/lib*/libpthread-2.4.so
+   obj:/lib*/libpthread-2.4.*so
+   obj:/lib*/libpthread-2.4.*so
+   obj:/lib*/libpthread-2.4.*so
 }
 {
    helgrind-glibc24-006
    Helgrind:Race
-   obj:/lib*/libpthread-2.4.so
-   obj:/lib*/libpthread-2.4.so
-   obj:/lib*/libc-2.4.so
+   obj:/lib*/libpthread-2.4.*so
+   obj:/lib*/libpthread-2.4.*so
+   obj:/lib*/libc-2.4.*so
 }
 {
    helgrind-glibc24-008
    Helgrind:Race
-   obj:/lib*/libpthread-2.4.so
-   obj:/lib*/libc-2.4.so
+   obj:/lib*/libpthread-2.4.*so
+   obj:/lib*/libc-2.4.*so
 }
 {
    helgrind-glibc24-010
    Helgrind:Race
-   obj:/lib*/ld-2.4.so
-   obj:/lib*/libpthread-2.4.so
+   obj:/lib*/ld-2.4.*so
+   obj:/lib*/libpthread-2.4.*so
 }
 {
    helgrind-glibc24-011
    Helgrind:Race
-   obj:/lib*/libc-2.4.so
-   obj:/lib*/libpthread-2.4.so
+   obj:/lib*/libc-2.4.*so
+   obj:/lib*/libpthread-2.4.*so
 }
 
 {
    helgrind-glibc24-101
    Helgrind:Race
-   obj:/lib*/libpthread-2.4.so
+   obj:/lib*/libpthread-2.4.*so
    fun:pthread_*
 }
 {
    helgrind-glibc24-102
    Helgrind:Race
    fun:mythread_wrapper
-   obj:/lib*/libpthread-2.4.so
+   obj:/lib*/libpthread-2.4.*so
 }
 
 ######------------ glibc-2.6 specific ---------######