diff --git a/ChangeLog b/ChangeLog
index 8447f6c522..470b3379b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@ Changes in version 0.2.0.5-alpha - 2007-??-??
       do not define s6_addr16 or s6_addr32.
     - Fix compile on platforms without getaddrinfo: bug found by Li-Hui
       Zhou.
+    - Do not automatically run configure from autogen.sh.  This non-standard
+      behavior tended to annoy people who have built other programs.
 
   o Minor features (directory servers):
     - When somebody requests a list of statuses or servers, and we have
diff --git a/autogen.sh b/autogen.sh
index 52833840b1..eb9395c719 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,7 +3,7 @@
 set -e
 
 # Run this to generate all the initial makefiles, etc.
-aclocal
-autoheader
-autoconf
-automake --add-missing --copy
+aclocal && \
+	autoheader && \
+	autoconf && \
+	automake --add-missing --copy