diff --git a/ChangeLog b/ChangeLog
index ed275973..fac139cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-22  Marcus Brinkmann  <marcus@g10code.de>
+
+	* autogen.sh: Invoke automake with `-a' (add missing files).
+	Do not invoke configure.
+
 2001-09-17  Werner Koch  <wk@gnupg.org>
 
 	Released 0.2.3.
diff --git a/TODO b/TODO
index f763a025..ad5ab742 100644
--- a/TODO
+++ b/TODO
@@ -16,6 +16,12 @@
 
 * Implement decrypt+verify
 
+* Tests
+** t-data
+*** Test gpgme_data_write and gpgme_data_release_and_get_mem.
+*** Test gpgme_data_rewind for invalid types.
+*** Test gpgme_data_read's readable feature.
+
 Bugs reported by Stephane Corthesy:
 > - When asking a GpgmeKey for one of its sub-userIDs (index > 0)  
 > GPGME_ATTR_EMAIL attribute, it returns the name + email, whereas for  
diff --git a/autogen.sh b/autogen.sh
index cf24171a..aca98064 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -143,19 +143,7 @@ echo "Running aclocal..."
 aclocal
 echo "Running autoheader..."
 autoheader
-echo "Running automake --gnu ..."
-automake --gnu;
+echo "Running automake --gnu -a ..."
+automake --gnu -a
 echo "Running autoconf..."
 autoconf
-
-if test "$*" = ""; then
-    conf_options="--enable-maintainer-mode"
-else
-    conf_options=$*
-fi
-echo "Running ./configure $conf_options"
-./configure $conf_options
-
-
-
-