Index: scripts/umount
===================================================================
--- scripts/umount
+++ scripts/umount
@@ -40,3 +40,14 @@
 
 umount $BSDINSTALL_CHROOT/dev 2>/dev/null
 umount -F $TMP_FSTAB -a 2>/dev/null
+
+if [ -n "$(kldstat | grep zfs)" ]; then
+	while [ -n $(zfs list -o name,mounted -H -r $ZFSBOOT_POOL_NAME | grep yes) ]
+	do
+		for mnt in $(zfs list -o name,mounted -H -r $ZFSBOOT_POOL_NAME | grep yes | awk '{print $1}')
+		do
+			zfs unmount $mnt
+		done
+	done
+fi
+