diff --git a/autogen.sh b/autogen.sh
index d256534c86..c7303b2338 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -31,8 +31,22 @@ autoreconf || failed "autoreconf"
 
 scripts/refresh-git-hooks || failed "refresh-git-hooks"
 
+if [ $# -gt 0 ]; then
+    # If we got parameters, we can execute configure directly.
+    echo -n "Result: All went OK, running $srcdir/configure "
+    for arg in "$@"
+    do
+        echo -n "'${arg}' "
+    done
+    echo "now."
+    $srcdir/configure "$@" || failed "configure"
+    exit 0
+fi
+
 cat << EOF
 
 Result: All went OK, please run $srcdir/configure (with the appropriate parameters) now.
 
 EOF
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab: