diff --git a/ChangeLog b/ChangeLog
index ec7e3f8191..806c648219 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-04-20  Ulrich Drepper  <drepper@redhat.com>
+
+	* manual/stdio.texi: Give advise about handling error when using
+	stream functions.
+	Patch by Michael Deutschmann <michael@talamasca.ocis.net>.
+
 2000-04-19  Jakub Jelinek  <jakub@redhat.com>
 
 	* locale/programs/ld-ctype.c (ctype_output): Set size of the idx
diff --git a/FAQ.in b/FAQ.in
index 380a69cb0d..348a8607cd 100644
--- a/FAQ.in
+++ b/FAQ.in
@@ -1083,9 +1083,6 @@ the one library cannot be read by functions from the other library.  Sorry,
 but this is what a major release is for.  It's better to have a cut now than
 having no means to support the new techniques later.
 
-{MK} There is however a (partial) solution for this problem.  Please take a
-look at the file `login/README.utmpd'.
-
 ??	Where are the DST_* constants found in <sys/time.h> on many
 	systems?
 
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index f97889f564..d78b0e7cc4 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,12 @@
+2000-04-20  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/pthread/bits/libc-lock.h: Only declare __pthread_rwlock_*
+	if __USE_UNIX98.
+
+2000-04-18  Andreas Jaeger  <aj@suse.de>
+
+	* Versions: Use ld instead of ld.so.
+
 2000-04-18  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/unix/sysv/linux/sparc/bits/sigcontext.h (struct sigcontext):