diff --git a/ChangeLog b/ChangeLog
index 0b175d6446..76c3734996 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2001-01-26  Ulrich Drepper  <drepper@redhat.com>
 
+	* conform/data/spawn.h-data: Correct posix_spawnattr_setflags
+	prototype.
+
 	* conform/conformtest.pl: Define $mustprepend{"signal.h"}.
 	* conform/data/signal.h-data: Fix sigev_notify_function entry.
 	Fix typo (SIGVALRM -> SIGVTALRM).
diff --git a/conform/data/spawn.h-data b/conform/data/spawn.h-data
index 877b752d6c..5d59dec0c8 100644
--- a/conform/data/spawn.h-data
+++ b/conform/data/spawn.h-data
@@ -18,7 +18,7 @@ function int posix_spawnattr_getschedpolicy (const posix_spawnattr_t*, int*)
 function int posix_spawnattr_getsigmask (const posix_spawnattr_t*, sigset_t*)
 function int posix_spawnattr_init (posix_spawnattr_t*)
 function int posix_spawnattr_setsigdefault (posix_spawnattr_t*, const sigset_t*)
-function int posix_spawnattr_setflags (posix_spawnattr_t*, const sigset_t*)
+function int posix_spawnattr_setflags (posix_spawnattr_t*, short)
 function int posix_spawnattr_setpgroup (posix_spawnattr_t*, pid_t)
 function int posix_spawnattr_setschedparam (posix_spawnattr_t*, const struct sched_param*)
 function int posix_spawnattr_setschedpolicy (posix_spawnattr_t*, int)
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 8936eac03a..0ba72795d3 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-26  Ulrich Drepper  <drepper@redhat.com>
+
+	* semaphore.h (sem_t): Cleanup namespace, rename status and
+	spinlock elements.
+
 2001-01-13  Jakub Jelinek  <jakub@redhat.com>
 
 	* pthread.c (pthread_onexit_process): Clear