diff --git a/htl/Makefile b/htl/Makefile
index e59a7fff68..ee377463a1 100644
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -29,8 +29,6 @@ libpthread-routines := \
   pt-hurd-cond-wait \
   pt-hurd-cond-timedwait \
   pt-spin \
-  pt-getname-np \
-  pt-setname-np \
   # libpthread-routine
 
 headers := \
@@ -122,6 +120,7 @@ routines := \
   pt-getattr \
   pt-getconcurrency \
   pt-getcpuclockid \
+  pt-getname-np \
   pt-getschedparam \
   pt-getspecific \
   pt-init-specific \
@@ -174,6 +173,7 @@ routines := \
   pt-setcancelstate \
   pt-setcanceltype \
   pt-setconcurrency \
+  pt-setname-np \
   pt-setschedparam \
   pt-setschedprio \
   pt-setspecific \
diff --git a/htl/Versions b/htl/Versions
index 343de800b0..ed29636917 100644
--- a/htl/Versions
+++ b/htl/Versions
@@ -157,6 +157,11 @@ libc {
     sem_clockwait;
   }
 
+  GLIBC_2.40 {
+    pthread_getname_np;
+    pthread_setname_np;
+  }
+
   GLIBC_2.41 {
     pthread_attr_getguardsize;
     pthread_attr_getstacksize;
@@ -225,10 +230,12 @@ libc {
     pthread_getattr_np;
     pthread_getconcurrency;
     pthread_getcpuclockid;
+    pthread_getname_np;
     pthread_join;
     pthread_kill;
     pthread_mutex_transfer_np;
     pthread_setconcurrency;
+    pthread_setname_np;
     pthread_setschedprio;
     pthread_testcancel;
     pthread_timedjoin_np;
@@ -345,7 +352,6 @@ libpthread {
   }
 
   GLIBC_2.40 {
-    pthread_getname_np;
-    pthread_setname_np;
+    __libpthread_version_placeholder;
   }
 }
diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h
index 5fb6469714..6ea1e79a92 100644
--- a/sysdeps/htl/pthreadP.h
+++ b/sysdeps/htl/pthreadP.h
@@ -225,6 +225,11 @@ int __pthread_setconcurrency (int __new_level);
 libc_hidden_proto (__pthread_setconcurrency)
 int __pthread_getconcurrency (void);
 libc_hidden_proto (__pthread_getconcurrency)
+int __pthread_getname_np (pthread_t __target_thread, char *__buf,
+			       size_t __buflen);
+libc_hidden_proto (__pthread_getname_np)
+int __pthread_setname_np (pthread_t __target_thread, const char *__name);
+libc_hidden_proto (__pthread_setname_np)
 
 #define __pthread_raise_internal(__sig) raise (__sig)
 
diff --git a/sysdeps/mach/htl/pt-getname-np.c b/sysdeps/mach/htl/pt-getname-np.c
index 7b836b667a..8db4d40693 100644
--- a/sysdeps/mach/htl/pt-getname-np.c
+++ b/sysdeps/mach/htl/pt-getname-np.c
@@ -23,6 +23,9 @@
 #include <string.h>
 
 #include <pt-internal.h>
+#include <string.h>
+#include <shlib-compat.h>
+#include <ldsodefs.h>
 
 int
 __pthread_getname_np (pthread_t thread, char *buf, size_t len)
@@ -64,4 +67,9 @@ __pthread_getname_np (pthread_t thread, char *buf, size_t len)
 #endif
 }
 
-weak_alias (__pthread_getname_np, pthread_getname_np)
+libc_hidden_def (__pthread_getname_np)
+versioned_symbol (libc, __pthread_getname_np, pthread_getname_np, GLIBC_2_43);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_40, GLIBC_2_43)
+compat_symbol (libc, __pthread_getname_np, pthread_getname_np, GLIBC_2_40);
+#endif
diff --git a/sysdeps/mach/htl/pt-setname-np.c b/sysdeps/mach/htl/pt-setname-np.c
index 58400c1edf..0a2a8df5cf 100644
--- a/sysdeps/mach/htl/pt-setname-np.c
+++ b/sysdeps/mach/htl/pt-setname-np.c
@@ -22,6 +22,8 @@
 #include <string.h>
 
 #include <pt-internal.h>
+#include <shlib-compat.h>
+#include <ldsodefs.h>
 
 int
 __pthread_setname_np (pthread_t thread, const char *name)
@@ -49,4 +51,9 @@ __pthread_setname_np (pthread_t thread, const char *name)
 #endif
 }
 
-weak_alias (__pthread_setname_np, pthread_setname_np)
+libc_hidden_def (__pthread_setname_np)
+versioned_symbol (libc, __pthread_setname_np, pthread_setname_np, GLIBC_2_43);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_40, GLIBC_2_43)
+compat_symbol (libpthread, __pthread_setname_np, pthread_setname_np, GLIBC_2_40);
+#endif
diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index f7c323c834..a01535746f 100644
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -2598,6 +2598,8 @@ GLIBC_2.4 readlinkat F
 GLIBC_2.4 renameat F
 GLIBC_2.4 symlinkat F
 GLIBC_2.4 unlinkat F
+GLIBC_2.40 pthread_getname_np F
+GLIBC_2.40 pthread_setname_np F
 GLIBC_2.41 pthread_attr_getguardsize F
 GLIBC_2.41 pthread_attr_getstack F
 GLIBC_2.41 pthread_attr_getstackaddr F
@@ -2676,10 +2678,12 @@ GLIBC_2.43 pthread_detach F
 GLIBC_2.43 pthread_getattr_np F
 GLIBC_2.43 pthread_getconcurrency F
 GLIBC_2.43 pthread_getcpuclockid F
+GLIBC_2.43 pthread_getname_np F
 GLIBC_2.43 pthread_join F
 GLIBC_2.43 pthread_kill F
 GLIBC_2.43 pthread_mutex_transfer_np F
 GLIBC_2.43 pthread_setconcurrency F
+GLIBC_2.43 pthread_setname_np F
 GLIBC_2.43 pthread_setschedprio F
 GLIBC_2.43 pthread_testcancel F
 GLIBC_2.43 pthread_timedjoin_np F
diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
index e1844a8f5e..318aa1a690 100644
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -33,5 +33,3 @@ GLIBC_2.32 tss_create F
 GLIBC_2.32 tss_delete F
 GLIBC_2.32 tss_get F
 GLIBC_2.32 tss_set F
-GLIBC_2.40 pthread_getname_np F
-GLIBC_2.40 pthread_setname_np F
diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist
index b482d2d040..38261ba339 100644
--- a/sysdeps/mach/hurd/x86_64/libc.abilist
+++ b/sysdeps/mach/hurd/x86_64/libc.abilist
@@ -2276,6 +2276,8 @@ GLIBC_2.39 stdc_trailing_zeros_ui F
 GLIBC_2.39 stdc_trailing_zeros_ul F
 GLIBC_2.39 stdc_trailing_zeros_ull F
 GLIBC_2.39 stdc_trailing_zeros_us F
+GLIBC_2.40 pthread_getname_np F
+GLIBC_2.40 pthread_setname_np F
 GLIBC_2.41 pthread_attr_getguardsize F
 GLIBC_2.41 pthread_attr_getstack F
 GLIBC_2.41 pthread_attr_getstackaddr F
@@ -2354,10 +2356,12 @@ GLIBC_2.43 pthread_detach F
 GLIBC_2.43 pthread_getattr_np F
 GLIBC_2.43 pthread_getconcurrency F
 GLIBC_2.43 pthread_getcpuclockid F
+GLIBC_2.43 pthread_getname_np F
 GLIBC_2.43 pthread_join F
 GLIBC_2.43 pthread_kill F
 GLIBC_2.43 pthread_mutex_transfer_np F
 GLIBC_2.43 pthread_setconcurrency F
+GLIBC_2.43 pthread_setname_np F
 GLIBC_2.43 pthread_setschedprio F
 GLIBC_2.43 pthread_testcancel F
 GLIBC_2.43 pthread_timedjoin_np F
diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist
index d4ae93df53..c9ad949d65 100644
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -32,5 +32,3 @@ GLIBC_2.38 tss_create F
 GLIBC_2.38 tss_delete F
 GLIBC_2.38 tss_get F
 GLIBC_2.38 tss_set F
-GLIBC_2.40 pthread_getname_np F
-GLIBC_2.40 pthread_setname_np F