diff --git a/ChangeLog b/ChangeLog
index 0032168a9c..22353d5f04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-23  Michael Natterer  <mitch@gimp.org>
+
+	* autogen.sh: be verbose about AUTOGEN_CONFIGURE_ARGS in the
+	message that is printed if no arguments were passed.
+
 2004-03-23  Sven Neumann  <sven@gimp.org>
 	    Michael Natterer <mitch@gimp.org>
 
diff --git a/autogen.sh b/autogen.sh
index 95932df666..f5a1687d09 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -178,10 +178,22 @@ test $TEST_TYPE $FILE || {
 
 
 if test -z "$*"; then
-    echo
-    echo "I am going to run ./configure with no arguments - if you wish "
-    echo "to pass any to it, please specify them on the $0 command line."
-    echo
+    if test -z "$AUTOGEN_CONFIGURE_ARGS"; then
+	echo
+	echo "I am going to run ./configure with no arguments - if you wish "
+	echo "to pass any to it, please specify them on the $0 command line "
+	echo "or set the AUTOGEN_CONFIGURE_ARGS environment variable."
+	echo
+    else
+	echo
+	echo "I am going to run ./configure with the following arguments:"
+	echo
+	echo "  $AUTOGEN_CONFIGURE_ARGS"
+	echo
+	echo "If you wish to pass additional arguments, please specify them "
+	echo "on the $0 command line."
+	echo
+    fi
 fi
 
 if test -z "$ACLOCAL_FLAGS"; then