diff --git a/srcpkgs/zfs/files/zfs-import/finish b/srcpkgs/zfs/files/zfs-import/finish
new file mode 100755
index 0000000000..0d4030803b
--- /dev/null
+++ b/srcpkgs/zfs/files/zfs-import/finish
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -e
+exec 2>&1
+zfs unshare -a
+zfs unmount -a
diff --git a/srcpkgs/zfs/files/zfs-import/run b/srcpkgs/zfs/files/zfs-import/run
new file mode 100755
index 0000000000..c833a6b856
--- /dev/null
+++ b/srcpkgs/zfs/files/zfs-import/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+exec 2>&1
+zpool import -a || exit 1
+exec chpst -b zfs-import pause
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index f39d655a40..de02a9fe4a 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zfs'
 pkgname=zfs
 version=0.6.4.1
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version/r/-}"
 build_style=gnu-configure
 configure_args="--with-config=user --sbindir=/usr/bin
@@ -38,6 +38,8 @@ post_install() {
 	vmkdir usr/src/${pkgname}-${version/r/-}
 	tar xf ../clean.tar.gz -C ${DESTDIR}/usr/src/${pkgname}-${version/r/-}
 	scripts/dkms.mkconf -v ${version/r/-} -f ${DESTDIR}/usr/src/${pkgname}-${version/r/-}/dkms.conf -n zfs
+
+	vsv zfs-import
 }
 zfs-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"