diff --git a/autogen.sh b/autogen.sh
index 2fbd426..0d43361 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,13 +1,10 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
-rm -rf */install-sh */missing
+rm -rf autom4te.cache aclocal.m4
 
-echo "  aclocal $ACLOCAL_FLAGS"
-aclocal $ACLOCAL_FLAGS
-echo "  automake --add-missing"
-automake --add-missing 
-echo "  autoconf"
-autoconf
+autoreconf -vif
 
-./configure "$@"
+if [ -z "$NOCONFIGURE" ]; then
+	./configure "$@"
+fi