diff --git a/config/Makefile.am b/config/Makefile.am
index 2d77282c19..b412e6bdc3 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -1 +1 @@
-EXTRA_DIST = zfs-build.m4 zfs-meta.m4 kernel.m4 user.m4 Rules.am
+EXTRA_DIST = *.m4 Rules.am
diff --git a/config/user.m4 b/config/user.m4
index 80a15ae082..719fd6a503 100644
--- a/config/user.m4
+++ b/config/user.m4
@@ -2,4 +2,6 @@ dnl #
 dnl # Default ZFS user configuration
 dnl #
 AC_DEFUN([ZFS_AC_CONFIG_USER], [
+	ZFS_AC_CONFIG_USER_LIBEFI
+	ZFS_AC_CONFIG_USER_IOCTL
 ])