diff --git a/bootstrap.conf b/bootstrap.conf
index 49261524a..018bc4eb3 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -196,7 +196,10 @@ gnulib_modules="
   priv-set
   progname
   propername
-  pthread
+  pthread-cond
+  pthread-mutex
+  pthread-thread
+  pthread_sigmask
   putenv
   quote
   quotearg
diff --git a/src/sort.c b/src/sort.c
index d812aa999..360a1f140 100644
--- a/src/sort.c
+++ b/src/sort.c
@@ -82,11 +82,6 @@ struct rlimit { size_t rlim_cur; };
 # endif
 #endif
 
-#if GNULIB_defined_pthread_functions
-# undef pthread_sigmask
-# define pthread_sigmask(how, set, oset) sigprocmask (how, set, oset)
-#endif
-
 #if !defined OPEN_MAX && defined NR_OPEN
 # define OPEN_MAX NR_OPEN
 #endif