diff --git a/zfs/zcmd/zpios/zpios.h b/cmd/zpios/zpios.h
similarity index 100%
rename from zfs/zcmd/zpios/zpios.h
rename to cmd/zpios/zpios.h
diff --git a/zfs/zcmd/zpios/zpios_main.c b/cmd/zpios/zpios_main.c
similarity index 100%
rename from zfs/zcmd/zpios/zpios_main.c
rename to cmd/zpios/zpios_main.c
diff --git a/zfs/zcmd/zpios/zpios_util.c b/cmd/zpios/zpios_util.c
similarity index 100%
rename from zfs/zcmd/zpios/zpios_util.c
rename to cmd/zpios/zpios_util.c
diff --git a/configure.ac b/configure.ac
index 2400bb47d9..c68e80da73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,5 +120,6 @@ AC_CONFIG_FILES([ Makefile
                   cmd/zinject/Makefile
                   cmd/zpool/Makefile
                   cmd/ztest/Makefile
+                  cmd/zpios/Makefile
                ])
 AC_OUTPUT
diff --git a/module/Makefile.in b/module/Makefile.in
index 031d97adfc..f93b196b07 100644
--- a/module/Makefile.in
+++ b/module/Makefile.in
@@ -1,4 +1,4 @@
-subdir-m = avl nvpair zcommon zfs
+subdir-m = avl nvpair zcommon zfs zpios
 
 # Make the exported SPL symbols available to these modules.
 # Unfortunately there is not a cleaner way to do this, modpost
diff --git a/zfs/lib/libzpios/Makefile.in b/module/zpios/Makefile.in
similarity index 100%
rename from zfs/lib/libzpios/Makefile.in
rename to module/zpios/Makefile.in
diff --git a/zfs/lib/libzpios/include/Makefile.in b/module/zpios/include/Makefile.in
similarity index 100%
rename from zfs/lib/libzpios/include/Makefile.in
rename to module/zpios/include/Makefile.in
diff --git a/zfs/lib/libzpios/include/kpios-ctl.h b/module/zpios/include/kpios-ctl.h
similarity index 100%
rename from zfs/lib/libzpios/include/kpios-ctl.h
rename to module/zpios/include/kpios-ctl.h
diff --git a/zfs/lib/libzpios/include/kpios-internal.h b/module/zpios/include/kpios-internal.h
similarity index 100%
rename from zfs/lib/libzpios/include/kpios-internal.h
rename to module/zpios/include/kpios-internal.h
diff --git a/zfs/lib/libzpios/kpios.c b/module/zpios/kpios.c
similarity index 100%
rename from zfs/lib/libzpios/kpios.c
rename to module/zpios/kpios.c
diff --git a/zfs/zcmd/zpios/Makefile.in b/zfs/zcmd/zpios/Makefile.in
deleted file mode 100644
index 3d4421bb7d..0000000000
--- a/zfs/zcmd/zpios/Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-DISTFILES = Makefile.in *.c zpios.h
-
-CMD := zpios
-
-HOSTCFLAGS += @HOSTCFLAGS@
-HOSTCFLAGS += -I@CMDDIR@/lzpios
-HOSTCFLAGS += -I@LIBDIR@/libzpios/include
-
-hostprogs-y := ${CMD}
-always := $(hostprogs-y)
-
-${CMD}-objs += zpios_main.o
-${CMD}-objs += zpios_util.o