diff --git a/ChangeLog b/ChangeLog
index b9983cc..4bb1db4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-12-29  Bruno Haible  <bruno@clisp.org>
+
+	Make autogen.sh more user-friendly.
+	* autogen.sh: Emit a message at the end, if everything succeeded.
+
 2016-12-03  Bruno Haible  <bruno@clisp.org>
 
 	Make Makefile.devel more useful for the users of the released tarball.
diff --git a/autogen.sh b/autogen.sh
index b809fa5..5091910 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -41,4 +41,6 @@ done
 chmod a+x build-aux/install-sh build-aux/mkinstalldirs \
           build-aux/compile build-aux/ar-lib
 
-make -f Makefile.devel totally-clean all
+make -f Makefile.devel totally-clean all || exit $?
+
+echo "$0: done.  Now you can run './configure'."