diff --git a/_autosetup b/_autosetup
index 9cb74adf68..6381105971 100755
--- a/_autosetup
+++ b/_autosetup
@@ -18,10 +18,15 @@ echo "Bootstrapping configure script and makefiles:"
 
 aclocal && automake && autoconf && autoheader
 
-## We don't just run ./configure ourselves here, because the user may not want
-## to run it, or may want to run with custom parameters.
-
-echo "Done, now run ./configure"
-echo " ./configure -C                         to enable caching"
-echo " ./configure --enable-maintainer-mode   to enable maintainer depedencies"
+## We don't always run ./configure ourselves here, because the user may not
+## want to run it, or may want to run with custom parameters.
 
+if [ "$1" = "-a" ]; then
+    ./configure --enable-maintainer-mode
+elif [ "$1" = "-c" ]; then
+    ./configure
+else
+    echo "Done, now run ./configure"
+    echo " ./configure -C                         to enable caching"
+    echo " ./configure --enable-maintainer-mode   to enable maintainer depedencies"
+fi
diff --git a/configure.ac b/configure.ac
index 005a0a73af..2a3c99ebe5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -150,6 +150,5 @@ AC_CONFIG_FILES([RSAEuro/source/Makefile
                  ])
 
 AC_CONFIG_HEADER([config.h])
-AC_CONFIG_HEADER([client/win/win_config.h])
 
 AC_OUTPUT