diff --git a/autogen.sh b/autogen.sh
index 72bba5b035..0fecdf8b38 100644
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,6 +3,6 @@
 aclocal -I config &&
 libtoolize --automake --copy
 autoheader &&
-automake --add-missing --include-deps 2>/dev/null
+automake --add-missing --include-deps
 autoconf
 rm -rf autom4te.cache aclocal.m4
diff --git a/config/Makefile.am b/config/Makefile.am
index d1fde7bb45..78256508f3 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -1,3 +1 @@
-EXTRA_DIST = zfs-build.m4
-EXTRA_DIST = kernel user lustre
-
+EXTRA_DIST = zfs-build.m4 zfs-meta.m4 kernel.m4 lustre.m4 user.m4