diff --git a/autogen.sh b/autogen.sh
index 854a961..3c1192f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,18 +1,24 @@
 #!/bin/sh
 
-rm -rf autom4te.cache
-rm -f aclocal.m4 ltmain.sh
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
+  (
+    cd "$srcdir" &&
+      (
+        rm -rf autom4te.cache
+        rm -f aclocal.m4 ltmain.sh
+        touch README
+        touch ABOUT-NLS
 
-touch README
-touch ABOUT-NLS
-
-echo "Running autopoint..." ; autopoint -f || :
-echo "Running aclocal..." ; aclocal -I m4 $ACLOCAL_FLAGS || exit 1
-echo "Running autoconf..." ; autoconf || exit 1
-echo "Running autoheader..." ; autoheader || exit 1
-echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1
-echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1
+        echo "Running autopoint..." ; autopoint -f || :
+        echo "Running aclocal..." ; aclocal -I m4 $ACLOCAL_FLAGS || exit 1
+        echo "Running autoconf..." ; autoconf || exit 1
+        echo "Running autoheader..." ; autoheader || exit 1
+        echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1
+        echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1
+     )
+  )
 
 if [ -z "$NOCONFIGURE" ]; then
-	./configure "$@"
+	$srcdir/configure "$@"
 fi