diff --git a/ChangeLog b/ChangeLog
index ebe68634216e5946513843caa4cf5f8d3aeb6843..fb49163c0de32bb7043b32cc512cd0b35bcecd6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-05-05  Niels Möller  <nisse@lysator.liu.se>
+
+	* src/argp/configure.ac: Pass no arguments to AM_INIT_AUTOMAKE.
+	Don't substitute LIBOBJS.
+
+	* src/argp/acinclude.m4: Use the three-argument form of
+	AC_DEFINE_UNQUOTED. 
+
+	* configure.ac: Pass no options to AM_INIT_AUTOMAKE.
+
 2002-05-05  Niels Möller  <nisse@cuckoo.hack.org>
 
 	* configure.ac: Update for automake-1.6.
diff --git a/src/nettle/ChangeLog b/src/nettle/ChangeLog
index 2387dda01162bccf8ff9fd82f7dfd289cd58f753..c05158759772f7677ebc552882b245f55a815b73 100644
--- a/src/nettle/ChangeLog
+++ b/src/nettle/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-05  Niels Möller  <nisse@lysator.liu.se>
+
+	* configure.ac: Pass no arguments to AM_INIT_AUTOMAKE.
+
 2002-05-05  Niels Möller  <nisse@cuckoo.hack.org>
 
 	* configure.ac: Update for automake-1.6.
diff --git a/src/sftp/ChangeLog b/src/sftp/ChangeLog
index cb93b6ccef5ab385b11f9782377841de20268605..a0dc77c9ed1235bd312a921343f4939cbc310adc 100644
--- a/src/sftp/ChangeLog
+++ b/src/sftp/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-05  Niels Möller  <nisse@lysator.liu.se>
+
+	* configure.ac: Pass no arguments to AM_INIT_AUTOMAKE. Use the
+	three-argument form of AC_DEFINE.
+
 2002-05-05  Niels Möller  <nisse@cuckoo.hack.org>
 
 	* configure.ac: Update for automake-1.6.