diff --git a/cmd/Makefile.am b/cmd/Makefile.am
index 30d3701c3f..b94adce038 100644
--- a/cmd/Makefile.am
+++ b/cmd/Makefile.am
@@ -1 +1 @@
-SUBDIRS = zdb zdump zfs zinject zpool ztest
+SUBDIRS = zdb zdump zfs zinject zpool ztest zpios
diff --git a/cmd/zpios/Makefile.am b/cmd/zpios/Makefile.am
new file mode 100644
index 0000000000..94a218d679
--- /dev/null
+++ b/cmd/zpios/Makefile.am
@@ -0,0 +1,8 @@
+include $(top_srcdir)/config/Rules.am
+
+sbin_PROGRAMS = zpios
+
+zpios_SOURCES = \
+	zpios.h \
+	zpios_main.c \
+	zpios_util.c
diff --git a/module/zpios/Makefile.in b/module/zpios/Makefile.in
index 2aa1482a8d..a6584b4aee 100644
--- a/module/zpios/Makefile.in
+++ b/module/zpios/Makefile.in
@@ -2,15 +2,8 @@ DISTFILES = Makefile.in *.c
 
 MODULE  := zpios
 
-# Compile as kernel module.  Needed symlinks created for all
-# k* objects created by top level configure script.
-
 EXTRA_CFLAGS  = @KERNELCPPFLAGS@
-EXTRA_CFLAGS += -I@LIBDIR@/libzpios/include
-EXTRA_CFLAGS += -I@LIBDIR@/libzcommon/include
-EXTRA_CFLAGS += -I@LIBDIR@/libport/include
-EXTRA_CFLAGS += -I@LIBDIR@/libavl/include
-EXTRA_CFLAGS += -I@LIBDIR@/libnvpair/include
+EXTRA_CFLAGS += -I@MODDIR@/zpios/include
 
 obj-m := ${MODULE}.o