diff --git a/configure.ac b/configure.ac
index c67792930b..9ec0dae6e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,6 +56,9 @@ AC_CONFIG_FILES([
 	doc/Makefile
 	lib/Makefile
 	lib/libspl/Makefile
+	lib/libspl/asm-i686/Makefile
+	lib/libspl/asm-x86_64/Makefile
+	lib/libspl/include/Makefile
 	lib/libavl/Makefile
 	lib/libnvpair/Makefile
 	lib/libunicode/Makefile
diff --git a/lib/libspl/Makefile.am b/lib/libspl/Makefile.am
index 09c5413659..93d1373f41 100644
--- a/lib/libspl/Makefile.am
+++ b/lib/libspl/Makefile.am
@@ -1,5 +1,6 @@
 include $(top_srcdir)/config/Rules.am
 
+SUBDIRS = asm-i686 asm-x86_64 include
 DEFAULT_INCLUDES += \
 	-I${top_srcdir}/lib/libspl/include
 
diff --git a/lib/libspl/asm-i686/Makefile.am b/lib/libspl/asm-i686/Makefile.am
new file mode 100644
index 0000000000..02403ecebb
--- /dev/null
+++ b/lib/libspl/asm-i686/Makefile.am
@@ -0,0 +1 @@
+noinst_HEADERS = *.S
diff --git a/lib/libspl/asm-x86_64/Makefile.am b/lib/libspl/asm-x86_64/Makefile.am
new file mode 100644
index 0000000000..02403ecebb
--- /dev/null
+++ b/lib/libspl/asm-x86_64/Makefile.am
@@ -0,0 +1 @@
+noinst_HEADERS = *.S
diff --git a/lib/libspl/include/Makefile.am b/lib/libspl/include/Makefile.am
new file mode 100644
index 0000000000..1acc8396d8
--- /dev/null
+++ b/lib/libspl/include/Makefile.am
@@ -0,0 +1,6 @@
+noinst_HEADERS  = *.h
+noinst_HEADERS += ia32/sys/*.h
+noinst_HEADERS += sys/*.h
+noinst_HEADERS += sys/fm/*.h
+noinst_HEADERS += sys/sysevent/*.h
+noinst_HEADERS += tsol/*.h