diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 0bd8a4a5cd..e129e8cbd5 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,5 +1,9 @@
 2000-04-12  Ulrich Drepper  <drepper@redhat.com>
 
+	* sysdeps/unix/sysv/linux/bits/posix_opt.h (_POSIX_SPIN_LOCKS):
+	Defined.
+	* sysdeps/unix/sysv/linux/i386/bits/posix_opt.h: Likewise.
+
 	* sysdeps/pthread/pthread.h: Add prototypes for pthread_spin_init,
 	pthread_spin_destroy, pthread_spin_lock, pthread_spin_trylock,
 	and pthread_spin_unlock.
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/bits/posix_opt.h b/linuxthreads/sysdeps/unix/sysv/linux/bits/posix_opt.h
index d5f9e3f35c..a3cc2c0866 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/bits/posix_opt.h
+++ b/linuxthreads/sysdeps/unix/sysv/linux/bits/posix_opt.h
@@ -122,4 +122,7 @@
 /* We support the Timeouts option.  */
 #define _POSIX_TIMEOUTS	200912L
 
+/* We support spinlocks.  */
+#define _POSIX_SPIN_LOCKS	200912L
+
 #endif /* posix_opt.h */
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/i386/bits/posix_opt.h b/linuxthreads/sysdeps/unix/sysv/linux/i386/bits/posix_opt.h
index 22c5a5b8ac..5e0098d946 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/i386/bits/posix_opt.h
+++ b/linuxthreads/sysdeps/unix/sysv/linux/i386/bits/posix_opt.h
@@ -131,4 +131,7 @@
 /* We support the Timeouts option.  */
 #define _POSIX_TIMEOUTS	200912L
 
+/* We support spinlocks.  */
+#define _POSIX_SPIN_LOCKS	200912L
+
 #endif /* posix_opt.h */