diff --git a/autogen.sh b/autogen.sh
index 0b51c5c2..6035bc02 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,20 @@
 #!/bin/sh
 
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
+
+olddir=`pwd`
+cd $srcdir
+
+AUTORECONF=`which autoreconf`
+if test -z $AUTORECONF; then
+        echo "*** No autoreconf found, please intall it ***"
+        exit 1
+fi
+
 mkdir -p m4
 
-exec autoreconf -vfi
+autoreconf --force --install --verbose
+
+cd $olddir
+test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"