diff --git a/CHANGES.current b/CHANGES.current
index 43092c74e..db2bab7d3 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -1,6 +1,9 @@
 Version 1.3.32 (in progress)
 ============================
 
+10/09/2007: olly
+	    Automatically rerun autogen.sh if configure.in is modified.
+
 10/09/2007: olly
 	    Enhance check-%-test-suite rule and friends to give a more helpful
 	    error message if you try them for a language which doesn't exist
diff --git a/Makefile.in b/Makefile.in
index c6e3a7bbf..99b07c438 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -508,10 +508,13 @@ configfiles:
 Makefile: $(srcdir)/Makefile.in config.status
 	$(SHELL) ./config.status
 
-# This target is usually called from Source/Makefile when configure.in has changed
-am--refresh:
-	@echo "Build system is out of date. Please reconfigure (rerun: ./autogen.sh && ./configure)"
-	@exit 1
+# This target is usually called from Source/Makefile when configure.in has
+# changed.
+am--refresh: $(srcdir)/configure
+
+$(srcdir)/configure: $(srcdir)/configure.in
+	@echo "Build system is out of date.  If the following commands fail, please reconfigure by hand (rerun: ./autogen.sh && ./configure)"
+	$(srcdir)/autogen.sh
+	$(SHELL) ./config.status --recheck
 
 # Makefile ends here
-