diff --git a/autogen.sh b/autogen.sh
index 4bc9d7d..cd72a66 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,14 +3,16 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-pushd $srcdir
+olddir="`pwd`"
+
+cd "$srcdir"
 
 libtoolize --copy --force || exit 1
 aclocal || exit 1
 autoheader || exit 1
 autoconf || exit 1
 automake -a -c || exit 1
-popd
+cd "$olddir"
 
 if test -z "$NOCONFIGURE"; then
     $srcdir/configure --enable-maintainer-mode --enable-examples-build \