diff --git a/ChangeLog b/ChangeLog
index 459d1271a2..487ff2b7e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-11  Roland McGrath  <roland@redhat.com>
+
+	* posix/tst-waitid.c (do_test): Ignore SIGCHLD before cleanup SIGKILL.
+
 2004-08-11  Ulrich Drepper  <drepper@redhat.com>
 
 	* time/tzset.c (tzset_internal): Add new parameter which is
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 5923824b09..931afc169a 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-11  Jakub Jelinek  <jakub@redhat.com>
+
+	* tst-rwlock14.c (tf): Read main thread handle from *ARG
+	before pthread_barrier_wait.
+
 2004-08-07  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S: