diff --git a/htl/Makefile b/htl/Makefile
index beb39e5fea..0318f8561e 100644
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -25,7 +25,6 @@ SYSDEPS := lockfile
 LCLHDRS :=
 
 libpthread-routines := \
-  pt-attr-getguardsize \
   pt-attr-getscope \
   pt-attr-getstack \
   pt-attr-getstackaddr \
@@ -200,6 +199,7 @@ routines := \
   pt-attr \
   pt-attr-destroy \
   pt-attr-getdetachstate \
+  pt-attr-getguardsize \
   pt-attr-getinheritsched \
   pt-attr-getschedparam \
   pt-attr-getschedpolicy \
diff --git a/htl/Versions b/htl/Versions
index 05ef80548f..336d81bd7c 100644
--- a/htl/Versions
+++ b/htl/Versions
@@ -14,6 +14,7 @@ libc {
     pthread_getschedparam;
     pthread_setschedparam;
     pthread_attr_destroy;
+    pthread_attr_getguardsize;
   }
 
   GLIBC_2.21 {
@@ -43,6 +44,11 @@ libc {
     thrd_current; thrd_equal; thrd_sleep; thrd_yield;
   }
 
+  GLIBC_2.41 {
+    pthread_attr_getguardsize;
+  }
+
+
   GLIBC_PRIVATE {
     __libc_alloca_cutoff;
     __libc_pthread_init;
@@ -79,7 +85,6 @@ libpthread {
 
     pthread_atfork;
 
-    pthread_attr_getguardsize;
     pthread_attr_getscope; pthread_attr_getstack; pthread_attr_getstackaddr;
     pthread_attr_getstacksize; pthread_attr_init;
     pthread_attr_setguardsize;
diff --git a/sysdeps/htl/pt-attr-getguardsize.c b/sysdeps/htl/pt-attr-getguardsize.c
index e9e56d0d60..986e212440 100644
--- a/sysdeps/htl/pt-attr-getguardsize.c
+++ b/sysdeps/htl/pt-attr-getguardsize.c
@@ -17,11 +17,17 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
+#include <shlib-compat.h>
 #include <pt-internal.h>
 
 int
-pthread_attr_getguardsize (const pthread_attr_t *attr, size_t * guardsize)
+__pthread_attr_getguardsize (const pthread_attr_t *attr, size_t * guardsize)
 {
   *guardsize = attr->__guardsize;
   return 0;
 }
+versioned_symbol (libpthread, __pthread_attr_getguardsize, pthread_attr_getguardsize, GLIBC_2_41);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41)
+compat_symbol (libpthread, __pthread_attr_getguardsize, pthread_attr_getguardsize, GLIBC_2_12);
+#endif
diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index 83c3218398..0a6f990c09 100644
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -31,6 +31,7 @@ GLIBC_2.11 mkstemps64 F
 GLIBC_2.12 __pthread_self F
 GLIBC_2.12 pthread_attr_destroy F
 GLIBC_2.12 pthread_attr_getdetachstate F
+GLIBC_2.12 pthread_attr_getguardsize F
 GLIBC_2.12 pthread_attr_getinheritsched F
 GLIBC_2.12 pthread_attr_getschedparam F
 GLIBC_2.12 pthread_attr_getschedpolicy F
@@ -2483,6 +2484,7 @@ GLIBC_2.4 readlinkat F
 GLIBC_2.4 renameat F
 GLIBC_2.4 symlinkat F
 GLIBC_2.4 unlinkat F
+GLIBC_2.41 pthread_attr_getguardsize F
 GLIBC_2.5 __readlinkat_chk F
 GLIBC_2.5 inet6_opt_append F
 GLIBC_2.5 inet6_opt_find F
diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
index f8f5daf567..3451543da5 100644
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -22,7 +22,6 @@ GLIBC_2.12 flockfile F
 GLIBC_2.12 ftrylockfile F
 GLIBC_2.12 funlockfile F
 GLIBC_2.12 pthread_atfork F
-GLIBC_2.12 pthread_attr_getguardsize F
 GLIBC_2.12 pthread_attr_getscope F
 GLIBC_2.12 pthread_attr_getstack F
 GLIBC_2.12 pthread_attr_getstackaddr F
diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist
index 7c685645bb..ca72304ddc 100644
--- a/sysdeps/mach/hurd/x86_64/libc.abilist
+++ b/sysdeps/mach/hurd/x86_64/libc.abilist
@@ -1513,6 +1513,7 @@ GLIBC_2.38 psiginfo F
 GLIBC_2.38 psignal F
 GLIBC_2.38 pthread_attr_destroy F
 GLIBC_2.38 pthread_attr_getdetachstate F
+GLIBC_2.38 pthread_attr_getguardsize F
 GLIBC_2.38 pthread_attr_getinheritsched F
 GLIBC_2.38 pthread_attr_getschedparam F
 GLIBC_2.38 pthread_attr_getschedpolicy F
@@ -2184,6 +2185,7 @@ 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.41 pthread_attr_getguardsize F
 HURD_CTHREADS_0.3 __cthread_getspecific F
 HURD_CTHREADS_0.3 __cthread_keycreate F
 HURD_CTHREADS_0.3 __cthread_setspecific F
diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist
index 54b3e34b9b..556cc6e2af 100644
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -39,7 +39,6 @@ GLIBC_2.38 mtx_lock F
 GLIBC_2.38 mtx_timedlock F
 GLIBC_2.38 mtx_trylock F
 GLIBC_2.38 mtx_unlock F
-GLIBC_2.38 pthread_attr_getguardsize F
 GLIBC_2.38 pthread_attr_getscope F
 GLIBC_2.38 pthread_attr_getstack F
 GLIBC_2.38 pthread_attr_getstackaddr F