diff --git a/ChangeLog b/ChangeLog
index 8289a00..dae3b08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-23  Bruno Haible  <bruno@clisp.org>
+
+	* autogen.sh: New file.
+	* Makefile.devel (build-prerequisites): New target.
+	(all): Depend on it.
+	(EXCLUDE): Also exclude autogen.sh.
+
 2008-03-23  Bruno Haible  <bruno@clisp.org>
 
 	Make "make -jN" work again, broken on 2008-02-23.
diff --git a/Makefile.devel b/Makefile.devel
index c7da7ed..74e326d 100644
--- a/Makefile.devel
+++ b/Makefile.devel
@@ -14,11 +14,14 @@ PACKEXT = .tar.bz2
 
 EXCLUDE=--exclude CVS\* --exclude \*.o --exclude *.lo --exclude .cvsignore \
         --exclude \*~ --exclude .\#\* --exclude .libs                      \
+        --exclude autogen.sh                                               \
         --exclude ${AUTOCONF_CACHE}
 
-all: configures documentation
+all: build-prerequisites documentation
 
 
+build-prerequisites: configures
+
 CONFIGURES = configure
 CONFIGURES_IN = configure.ac
 
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..784493a
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+# Convenience script for regenerating all autogeneratable files that are
+# omitted from the version control repository. In particular, this script
+# also regenerates all aclocal.m4, config.h.in, Makefile.in, configure files
+# with new versions of autoconf or automake.
+#
+# This script requires
+#   - autoconf >= 2.60 and automake >= 1.10 in the PATH,
+#   - GNU make in the PATH.
+
+# Usage: ./autogen.sh
+
+make -f Makefile.devel build-prerequisites