diff --git a/autogen.sh b/autogen.sh
index 2ce37aa0..1b04bc87 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -33,14 +33,14 @@ if test "$DIE" -eq 1; then
         exit 1
 fi
 
-echo "  libtoolize --copy --force"
-libtoolize --copy --force
+echo "  libtoolize --copy --force --automake"
+libtoolize --copy --force --automake
 echo "  aclocal -I . $ACLOCAL_FLAGS"
 aclocal -I . $ACLOCAL_FLAGS
 echo "  autoheader"
 autoheader
-echo "  automake --add-missing"
-automake --add-missing
+echo "  automake --add-missing --gnu --include-deps"
+automake --add-missing --gnu --include-deps
 echo "  autoconf"
 autoconf
 
diff --git a/update-autoconf b/update-autoconf
index 5fbcf4d0..50b70025 100755
--- a/update-autoconf
+++ b/update-autoconf
@@ -4,8 +4,8 @@
 # and friends, quickly.
 #
 
-aclocal
+aclocal -I .
 autoheader
 autoconf
-libtoolize --force --automake
-automake -a --gnu --include-deps
+libtoolize --copy --force --automake
+automake --add-missing --gnu --include-deps