diff --git a/Makefile.in b/Makefile.in
index 2cffb8e9d3..1f83ce4e66 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -39,7 +39,20 @@ target_triplet = @target@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/zfs_config.h.in \
-	$(top_srcdir)/configure AUTHORS COPYING ChangeLog
+	$(top_srcdir)/configure $(top_srcdir)/module/Makefile.in \
+	$(top_srcdir)/module/avl/Makefile.in \
+	$(top_srcdir)/module/avl/include/Makefile.in \
+	$(top_srcdir)/module/avl/include/sys/Makefile.in \
+	$(top_srcdir)/module/nvpair/Makefile.in \
+	$(top_srcdir)/module/nvpair/include/Makefile.in \
+	$(top_srcdir)/module/nvpair/include/sys/Makefile.in \
+	$(top_srcdir)/module/zcommon/Makefile.in \
+	$(top_srcdir)/module/zcommon/include/Makefile.in \
+	$(top_srcdir)/module/zcommon/include/sys/Makefile.in \
+	$(top_srcdir)/module/zcommon/include/sys/fm/Makefile.in \
+	$(top_srcdir)/module/zcommon/include/sys/fm/fs/Makefile.in \
+	$(top_srcdir)/module/zcommon/include/sys/fs/Makefile.in \
+	$(top_srcdir)/module/zfs/Makefile.in AUTHORS COPYING ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \
 	$(top_srcdir)/config/kernel.m4 \
@@ -55,7 +68,15 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno configure.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = zfs_config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = module/Makefile module/avl/Makefile \
+	module/avl/include/Makefile module/avl/include/sys/Makefile \
+	module/nvpair/Makefile module/nvpair/include/Makefile \
+	module/nvpair/include/sys/Makefile module/zcommon/Makefile \
+	module/zcommon/include/Makefile \
+	module/zcommon/include/sys/Makefile \
+	module/zcommon/include/sys/fs/Makefile \
+	module/zcommon/include/sys/fm/Makefile \
+	module/zcommon/include/sys/fm/fs/Makefile module/zfs/Makefile
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -265,6 +286,34 @@ $(srcdir)/zfs_config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 
 distclean-hdr:
 	-rm -f zfs_config.h stamp-h1
+module/Makefile: $(top_builddir)/config.status $(top_srcdir)/module/Makefile.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+module/avl/Makefile: $(top_builddir)/config.status $(top_srcdir)/module/avl/Makefile.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+module/avl/include/Makefile: $(top_builddir)/config.status $(top_srcdir)/module/avl/include/Makefile.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+module/avl/include/sys/Makefile: $(top_builddir)/config.status $(top_srcdir)/module/avl/include/sys/Makefile.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+module/nvpair/Makefile: $(top_builddir)/config.status $(top_srcdir)/module/nvpair/Makefile.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+module/nvpair/include/Makefile: $(top_builddir)/config.status $(top_srcdir)/module/nvpair/include/Makefile.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+module/nvpair/include/sys/Makefile: $(top_builddir)/config.status $(top_srcdir)/module/nvpair/include/sys/Makefile.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+module/zcommon/Makefile: $(top_builddir)/config.status $(top_srcdir)/module/zcommon/Makefile.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+module/zcommon/include/Makefile: $(top_builddir)/config.status $(top_srcdir)/module/zcommon/include/Makefile.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+module/zcommon/include/sys/Makefile: $(top_builddir)/config.status $(top_srcdir)/module/zcommon/include/sys/Makefile.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+module/zcommon/include/sys/fs/Makefile: $(top_builddir)/config.status $(top_srcdir)/module/zcommon/include/sys/fs/Makefile.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+module/zcommon/include/sys/fm/Makefile: $(top_builddir)/config.status $(top_srcdir)/module/zcommon/include/sys/fm/Makefile.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+module/zcommon/include/sys/fm/fs/Makefile: $(top_builddir)/config.status $(top_srcdir)/module/zcommon/include/sys/fm/fs/Makefile.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+module/zfs/Makefile: $(top_builddir)/config.status $(top_srcdir)/module/zfs/Makefile.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -411,7 +460,7 @@ distclean-tags:
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/config
+	$(mkdir_p) $(distdir)/config $(distdir)/module $(distdir)/module/avl $(distdir)/module/avl/include $(distdir)/module/avl/include/sys $(distdir)/module/nvpair $(distdir)/module/nvpair/include $(distdir)/module/nvpair/include/sys $(distdir)/module/zcommon $(distdir)/module/zcommon/include $(distdir)/module/zcommon/include/sys $(distdir)/module/zcommon/include/sys/fm $(distdir)/module/zcommon/include/sys/fm/fs $(distdir)/module/zcommon/include/sys/fs $(distdir)/module/zfs
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
diff --git a/configure b/configure
index 0f85a0ad8f..f75b4105b0 100755
--- a/configure
+++ b/configure
@@ -20086,7 +20086,7 @@ _ACEOF
         fi
 
 
-                                                                                                                                                                                              ac_config_files="$ac_config_files Makefile config/Makefile doc/Makefile scripts/Makefile lib/Makefile lib/libspl/Makefile lib/libavl/Makefile lib/libnvpair/Makefile lib/libuutil/Makefile lib/libzpool/Makefile lib/libzfs/Makefile cmd/Makefile cmd/zdb/Makefile cmd/zdump/Makefile cmd/zfs/Makefile cmd/zinject/Makefile cmd/zpool/Makefile cmd/ztest/Makefile cmd/zpios/Makefile"
+                                                                                                                                                                                                                                                                                                                                          ac_config_files="$ac_config_files Makefile config/Makefile doc/Makefile scripts/Makefile lib/Makefile lib/libspl/Makefile lib/libavl/Makefile lib/libnvpair/Makefile lib/libuutil/Makefile lib/libzpool/Makefile lib/libzfs/Makefile cmd/Makefile cmd/zdb/Makefile cmd/zdump/Makefile cmd/zfs/Makefile cmd/zinject/Makefile cmd/zpool/Makefile cmd/ztest/Makefile cmd/zpios/Makefile module/Makefile module/avl/Makefile module/avl/include/Makefile module/avl/include/sys/Makefile module/nvpair/Makefile module/nvpair/include/Makefile module/nvpair/include/sys/Makefile module/zcommon/Makefile module/zcommon/include/Makefile module/zcommon/include/sys/Makefile module/zcommon/include/sys/fs/Makefile module/zcommon/include/sys/fm/Makefile module/zcommon/include/sys/fm/fs/Makefile module/zfs/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -20670,6 +20670,20 @@ do
   "cmd/zpool/Makefile" ) CONFIG_FILES="$CONFIG_FILES cmd/zpool/Makefile" ;;
   "cmd/ztest/Makefile" ) CONFIG_FILES="$CONFIG_FILES cmd/ztest/Makefile" ;;
   "cmd/zpios/Makefile" ) CONFIG_FILES="$CONFIG_FILES cmd/zpios/Makefile" ;;
+  "module/Makefile" ) CONFIG_FILES="$CONFIG_FILES module/Makefile" ;;
+  "module/avl/Makefile" ) CONFIG_FILES="$CONFIG_FILES module/avl/Makefile" ;;
+  "module/avl/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES module/avl/include/Makefile" ;;
+  "module/avl/include/sys/Makefile" ) CONFIG_FILES="$CONFIG_FILES module/avl/include/sys/Makefile" ;;
+  "module/nvpair/Makefile" ) CONFIG_FILES="$CONFIG_FILES module/nvpair/Makefile" ;;
+  "module/nvpair/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES module/nvpair/include/Makefile" ;;
+  "module/nvpair/include/sys/Makefile" ) CONFIG_FILES="$CONFIG_FILES module/nvpair/include/sys/Makefile" ;;
+  "module/zcommon/Makefile" ) CONFIG_FILES="$CONFIG_FILES module/zcommon/Makefile" ;;
+  "module/zcommon/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES module/zcommon/include/Makefile" ;;
+  "module/zcommon/include/sys/Makefile" ) CONFIG_FILES="$CONFIG_FILES module/zcommon/include/sys/Makefile" ;;
+  "module/zcommon/include/sys/fs/Makefile" ) CONFIG_FILES="$CONFIG_FILES module/zcommon/include/sys/fs/Makefile" ;;
+  "module/zcommon/include/sys/fm/Makefile" ) CONFIG_FILES="$CONFIG_FILES module/zcommon/include/sys/fm/Makefile" ;;
+  "module/zcommon/include/sys/fm/fs/Makefile" ) CONFIG_FILES="$CONFIG_FILES module/zcommon/include/sys/fm/fs/Makefile" ;;
+  "module/zfs/Makefile" ) CONFIG_FILES="$CONFIG_FILES module/zfs/Makefile" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "zfs_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS zfs_config.h" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5