diff --git a/ChangeLog b/ChangeLog
index f563ab61fd8bcd0d065c80c86fdcc546103e15a9..0fc4109ab9b900489d66b15c4766683074eb84e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-05-06  Niels Möller  <niels@s3.kth.se>
+
+	* src/argp/configure.ac: Use AH_TEMPLATE for
+	PROGRAM_INVOCATION_NAME and PROGRAM_INVOCATION_SHORT_NAME. The
+	third arg to AC_DEFINE_UNQUOTED seems not to work here. 
+
+	* configure.ac (CFLAGS): Don't enable -Waggregate-return.
+
 2002-05-06  Niels Möller  <nisse@cuckoo.hack.org>
 
 	* src/gateway_channel.c (do_gateway_channel_open): Undid previous
diff --git a/src/nettle/ChangeLog b/src/nettle/ChangeLog
index c05158759772f7677ebc552882b245f55a815b73..f3081fe7528c75c1b2a6ad066a1a11f7c286ffa1 100644
--- a/src/nettle/ChangeLog
+++ b/src/nettle/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-06  Niels Möller  <niels@s3.kth.se>
+
+	* configure.ac (CFLAGS): Don't enable -Waggregate-return.
+
 2002-05-05  Niels Möller  <nisse@lysator.liu.se>
 
 	* configure.ac: Pass no arguments to AM_INIT_AUTOMAKE.
diff --git a/src/sftp/ChangeLog b/src/sftp/ChangeLog
index 0ac0823476988aa30b5c213a14e37229d49ef453..5e877ccf9d6537ee9c736058138cd280f0765cce 100644
--- a/src/sftp/ChangeLog
+++ b/src/sftp/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-06  Niels Möller  <niels@s3.kth.se>
+
+	* configure.ac (CFLAGS): Don't enable -Waggregate-return.
+
 2002-05-05  Niels Möller  <nisse@lysator.liu.se>
 
 	* acconfig.h: Deleted file.