diff --git a/Changelog b/Changelog
index 4fe7778..fa8a6a2 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,7 @@
 [Changes 1.2.2]
 
+* Apply patch from cpet to make autogen.sh prompt to run configure. (caf)
+
 * Improve some messages in /window size (reported by cpet). (caf)
 
 * Improve messages around DCC auto-get / auto-rename / auto-resume. (caf)
diff --git a/autogen.sh b/autogen.sh
index 5e710cc..e955644 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -152,9 +152,18 @@ do
 done
 
 if test x"$NOCONFIGURE" = x; then
+  read -p "Would you like to run configure? (y/n): " var
+else
+  var=n
+fi
+
+case $var in
+y|Y|yes|YES)
   rm -f $srcdir/config.cache
   echo Running $srcdir/configure $conf_flags "$@" ...
   $srcdir/configure $conf_flags "$@"
-else
+;;
+*)
   echo Skipping configure process.
-fi
+;;
+esac