diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 9102cd044c..643013288e 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-10  Ulrich Drepper  <drepper@redhat.com>
+
+	* wrapsyscall.c: Add __nanosleep alias.
+	* Versions (GLIBC_2.2.6): Add __nanosleep.
+
 2002-06-19  Steven Munroe  <sjmunroe@vnet.ibm.com>
 
 	* Examples/ex9.c (main):  Use list of children and join them.
diff --git a/linuxthreads/Versions b/linuxthreads/Versions
index ac66f305f6..3124814d99 100644
--- a/linuxthreads/Versions
+++ b/linuxthreads/Versions
@@ -153,6 +153,10 @@ libpthread {
     # Extensions.
     pthread_getattr_np;
   }
+  GLIBC_2.2.6 {
+    # Cancellation wrapper
+    __nanosleep;
+  }
   GLIBC_PRIVATE {
     # Internal libc interface to libpthread
     __libc_internal_tsd_get; __libc_internal_tsd_set;
diff --git a/linuxthreads/wrapsyscall.c b/linuxthreads/wrapsyscall.c
index 5acc60b1a1..a260c970aa 100644
--- a/linuxthreads/wrapsyscall.c
+++ b/linuxthreads/wrapsyscall.c
@@ -105,6 +105,7 @@ CANCELABLE_SYSCALL (int, msync, (__ptr_t addr, size_t length, int flags),
 CANCELABLE_SYSCALL (int, nanosleep, (const struct timespec *requested_time,
 				     struct timespec *remaining),
 		    (requested_time, remaining))
+strong_alias (nanosleep, __nanosleep)
 
 
 /* open(2).  */
diff --git a/sysdeps/unix/sysv/sysv4/bits/sigset.h b/sysdeps/unix/sysv/sysv4/bits/sigset.h
index bf0cae2101..9093c72952 100644
--- a/sysdeps/unix/sysv/sysv4/bits/sigset.h
+++ b/sysdeps/unix/sysv/sysv4/bits/sigset.h
@@ -1,5 +1,5 @@
 /* __sig_atomic_t, __sigset_t, and related definitions.  SVR4 version.
-   Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1994-1996, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -44,7 +44,7 @@ typedef struct
 
 
 /* It's easier to assume 8-bit bytes than to get CHAR_BIT.  */
-#define	__NSSBITS	(sizeof (__sigset_t) * 8)
+#define	__NSSBITS	(sizeof (unsigned long int) * 8)
 #define	__SSELT(s)	((s) / __NSSBITS)
 #define	__SSMASK(s)	(1 << ((s) % __NSSBITS))