diff --git a/Makefile.am b/Makefile.am
index 18ad36d2ba..9c299a9efe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,6 @@
+
+ACLOCAL_AMFLAGS = -I config
+
 include $(top_srcdir)/config/rpm.am
 include $(top_srcdir)/config/deb.am
 include $(top_srcdir)/config/tgz.am
diff --git a/autogen.sh b/autogen.sh
index 343265c830..427394af47 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,4 @@
 #!/bin/sh
 
-aclocal -I config
-libtoolize --automake --copy
-autoheader
-automake --add-missing --include-deps --copy
-autoconf
+autoreconf -fiv
+rm -Rf autom4te.cache
diff --git a/config/.gitignore b/config/.gitignore
index dcd88d7c6a..12e6ecab10 100644
--- a/config/.gitignore
+++ b/config/.gitignore
@@ -4,3 +4,5 @@
 /install-sh
 /ltmain.sh
 /missing
+/libtool.m4
+/lt*.m4
diff --git a/configure.ac b/configure.ac
index 413114bac2..a058a1fff4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,7 @@ AC_INIT
 AC_LANG(C)
 ZFS_AC_META
 AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_MACRO_DIR([config])
 AC_CANONICAL_SYSTEM
 AM_MAINTAINER_MODE
 AM_SILENT_RULES