diff --git a/AUTHORS b/AUTHORS
index db912e6f3..8c3e87a4f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -242,6 +242,12 @@ Marc Feeley:
 In the subdirectory doc, wrote:
     pretty-print.scm
 
+Matthias Koeppe:
+In the subdirectory test-suite/tests, wrote
+    format.test, srfi-19.test, optargs.test
+In the subdirectory test-suite/tests, changes to
+    ports.test
+
 The file libguile/gc_os_dep.c is from the Boehm-Weiser conservative
 collector.  A lot of people have contributed to it, but probably not
 all to the code in gc_os_dep.c:
diff --git a/ChangeLog b/ChangeLog
index eec6cba1c..e9404f91a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-16  Marius Vollmer  <mvo@zagadka.ping.de>
+
+	* libguile.h (scm_cond_t, scm_key_t, scm_mutex_t): Only define
+	these when using threads.
+
 2001-06-14  Marius Vollmer  <mvo@zagadka.ping.de>
 
 	* libguile.h: Added deprecated section with the olde type names.
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 366a64dac..900deff30 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-16  Marius Vollmer  <mvo@zagadka.ping.de>
+
+	* posix.texi (Conventions): Use `system-error-errno' instead of
+	explicit code
+
 2001-06-04  Gary Houston  <ghouston@arglist.com>
 
 	* scheme-io.texi (Block Reading and Writing): added 
diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog
index 8dddec587..6df92b26a 100644
--- a/ice-9/ChangeLog
+++ b/ice-9/ChangeLog
@@ -1,3 +1,7 @@
+2001-06-16  Marius Vollmer  <mvo@zagadka.ping.de>
+
+	* boot-9.scm (system-error-errno): New.
+
 2001-06-14  Marius Vollmer  <mvo@zagadka.ping.de>
 
 	* common-list.scm (remove-if, remove-if-not): Fix typo: use
diff --git a/test-suite/ChangeLog b/test-suite/ChangeLog
index a31a0dfec..afb2667f5 100644
--- a/test-suite/ChangeLog
+++ b/test-suite/ChangeLog
@@ -1,3 +1,11 @@
+2001-06-16  Marius Vollmer  <mvo@zagadka.ping.de>
+
+        Thanks to Matthias Köppe!
+
+	* tests/ports.test: New test for output port line counts.
+	* tests/format.test, tests/optargs.test, tests/srfi-19.test: New
+	files.
+
 2001-05-28  Martin Grabmueller  <mgrabmue@cs.tu-berlin.de>
 
 	* tests/symbols.test ("gensym"): New tests for long gensym