diff --git a/cmd/Makefile.am b/cmd/Makefile.am
new file mode 100644
index 0000000000..30d3701c3f
--- /dev/null
+++ b/cmd/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = zdb zdump zfs zinject zpool ztest
diff --git a/cmd/zdb/Makefile.am b/cmd/zdb/Makefile.am
new file mode 100644
index 0000000000..ac0c6f1073
--- /dev/null
+++ b/cmd/zdb/Makefile.am
@@ -0,0 +1,12 @@
+include $(top_srcdir)/config/Rules.am
+
+DEFAULT_INCLUDES  = -I${top_srcdir}/lib/libspl/include
+
+sbin_PROGRAMS = zdb
+
+zdb_SOURCES = \
+	zdb.c \
+	zdb_il.c
+
+zdump_LDADD = \
+	$(top_builddir)/lib/libspl/libspl.la
diff --git a/cmd/zdump/Makefile.am b/cmd/zdump/Makefile.am
new file mode 100644
index 0000000000..73d718f736
--- /dev/null
+++ b/cmd/zdump/Makefile.am
@@ -0,0 +1,11 @@
+include $(top_srcdir)/config/Rules.am
+
+DEFAULT_INCLUDES  = -I${top_srcdir}/lib/libspl/include
+
+sbin_PROGRAMS = zdump
+
+zdump_SOURCES = \
+	zdump.c
+
+zdump_LDADD = \
+	$(top_builddir)/lib/libspl/libspl.la
diff --git a/cmd/zfs/Makefile.am b/cmd/zfs/Makefile.am
new file mode 100644
index 0000000000..871f058855
--- /dev/null
+++ b/cmd/zfs/Makefile.am
@@ -0,0 +1,14 @@
+include $(top_srcdir)/config/Rules.am
+
+DEFAULT_INCLUDES  = -I${top_srcdir}/lib/libspl/include
+
+sbin_PROGRAMS = zfs
+
+zfs_SOURCES = \
+	zfs_iter.c \
+	zfs_iter.h \
+	zfs_main.c \
+	zfs_util.h
+
+zfs_LDADD = \
+	$(top_builddir)/lib/libspl/libspl.la
diff --git a/cmd/zinject/Makefile.am b/cmd/zinject/Makefile.am
new file mode 100644
index 0000000000..632973d147
--- /dev/null
+++ b/cmd/zinject/Makefile.am
@@ -0,0 +1,13 @@
+include $(top_srcdir)/config/Rules.am
+
+DEFAULT_INCLUDES  = -I${top_srcdir}/lib/libspl/include
+
+sbin_PROGRAMS = zinject
+
+zinject_SOURCES = \
+	translate.c \
+	zinject.ci \
+	zinject.h
+
+zinject_LDADD = \
+	$(top_builddir)/lib/libspl/libspl.la
diff --git a/cmd/zpool/Makefile.am b/cmd/zpool/Makefile.am
new file mode 100644
index 0000000000..81911828c4
--- /dev/null
+++ b/cmd/zpool/Makefile.am
@@ -0,0 +1,15 @@
+include $(top_srcdir)/config/Rules.am
+
+DEFAULT_INCLUDES  = -I${top_srcdir}/lib/libspl/include
+
+sbin_PROGRAMS = zpool
+
+zpool_SOURCES = \
+	zpool_iter.c \
+	zpool_main.c \
+	zpool_util.c \
+	zpool_util.h \
+	zpool_vdev.c
+
+zpool_LDADD = \
+	$(top_builddir)/lib/libspl/libspl.la
diff --git a/cmd/ztest/Makefile.am b/cmd/ztest/Makefile.am
new file mode 100644
index 0000000000..6df8699532
--- /dev/null
+++ b/cmd/ztest/Makefile.am
@@ -0,0 +1,11 @@
+include $(top_srcdir)/config/Rules.am
+
+DEFAULT_INCLUDES  = -I${top_srcdir}/lib/libspl/include
+
+sbin_PROGRAMS = ztest
+
+ztest_SOURCES = \
+	ztest.c
+
+ztest_LDADD = \
+	$(top_builddir)/lib/libspl/libspl.la
diff --git a/lib/libnvpair/Makefile.am b/lib/libnvpair/Makefile.am
index 9b7bf0b89e..7a365860d4 100644
--- a/lib/libnvpair/Makefile.am
+++ b/lib/libnvpair/Makefile.am
@@ -11,4 +11,4 @@ libnvpair_la_SOURCES = libnvpair.c \
                        include/libnvpair.h
                        ${moddir}/nvpair/nvpair.c \
                        ${moddir}/nvpair/include/sys/nvpair.h \
-                       ${moddir}/nvpair/include/sys/nvpair_impl.h \
+                       ${moddir}/nvpair/include/sys/nvpair_impl.h
diff --git a/lib/libzcommon/Makefile.am b/lib/libzcommon/Makefile.am
index c8b3545225..8ad22bcbac 100644
--- a/lib/libzcommon/Makefile.am
+++ b/lib/libzcommon/Makefile.am
@@ -17,4 +17,4 @@ libzfs_la_SOURCES = ${moddir}/zcommon/zfs_comutil.c \
                     ${moddir}/zcommon/include/zfs_comutil.h \
                     ${moddir}/zcommon/include/zfs_deleg.h \
                     ${moddir}/zcommon/include/zfs_namecheck.h \
-                    ${moddir}/zcommon/include/zfs_prop.h \
+                    ${moddir}/zcommon/include/zfs_prop.h