Index: head/sysutils/openzfs-kmod/Makefile
===================================================================
--- head/sysutils/openzfs-kmod/Makefile
+++ head/sysutils/openzfs-kmod/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	openzfs
-PORTVERSION=	2020072000
+PORTVERSION=	2020080100
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 PKGNAMESUFFIX?=	-kmod
@@ -17,7 +17,7 @@
 USE_GITHUB=	yes
 GH_ACCOUNT=	openzfs
 GH_PROJECT=	zfs
-GH_TAGNAME=	317dbea17
+GH_TAGNAME=	da60484db
 KMODTARGET?=	openzfs.ko
 
 PLIST_FILES=	${KMODDIR}/${KMODTARGET}
Index: head/sysutils/openzfs-kmod/distinfo
===================================================================
--- head/sysutils/openzfs-kmod/distinfo
+++ head/sysutils/openzfs-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1595282959
-SHA256 (openzfs-zfs-v2020072000-317dbea17_GH0.tar.gz) = ecb34827780c32ef9e3f059c17d4e40ff5e2cb868c91c2a00a11f83b9217c57a
-SIZE (openzfs-zfs-v2020072000-317dbea17_GH0.tar.gz) = 9211532
+TIMESTAMP = 1596306143
+SHA256 (openzfs-zfs-v2020080100-da60484db_GH0.tar.gz) = 9e0b37776a75f30600ac6316b2fc34b1d5325381df60f5e39431d21f0c9e1117
+SIZE (openzfs-zfs-v2020080100-da60484db_GH0.tar.gz) = 9215333
Index: head/sysutils/openzfs/Makefile
===================================================================
--- head/sysutils/openzfs/Makefile
+++ head/sysutils/openzfs/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	openzfs
-PORTVERSION=	2020072000
+PORTVERSION=	2020080100
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
@@ -28,7 +28,7 @@
 USE_GITHUB=	yes
 GH_ACCOUNT=	openzfs
 GH_PROJECT=	zfs
-GH_TAGNAME=	317dbea17
+GH_TAGNAME=	da60484db
 
 .include <bsd.port.pre.mk>
 
Index: head/sysutils/openzfs/distinfo
===================================================================
--- head/sysutils/openzfs/distinfo
+++ head/sysutils/openzfs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1595283051
-SHA256 (openzfs-zfs-v2020072000-317dbea17_GH0.tar.gz) = ecb34827780c32ef9e3f059c17d4e40ff5e2cb868c91c2a00a11f83b9217c57a
-SIZE (openzfs-zfs-v2020072000-317dbea17_GH0.tar.gz) = 9211532
+TIMESTAMP = 1596306216
+SHA256 (openzfs-zfs-v2020080100-da60484db_GH0.tar.gz) = 9e0b37776a75f30600ac6316b2fc34b1d5325381df60f5e39431d21f0c9e1117
+SIZE (openzfs-zfs-v2020080100-da60484db_GH0.tar.gz) = 9215333
Index: head/sysutils/openzfs/pkg-plist
===================================================================
--- head/sysutils/openzfs/pkg-plist
+++ head/sysutils/openzfs/pkg-plist
@@ -201,7 +201,6 @@
 include/libzfs/sys/pathname.h
 include/libzfs/sys/qat.h
 include/libzfs/sys/range_tree.h
-include/libzfs/sys/refcount.h
 include/libzfs/sys/rrwlock.h
 include/libzfs/sys/sa.h
 include/libzfs/sys/sa_impl.h
@@ -257,6 +256,7 @@
 include/libzfs/sys/zfs_project.h
 include/libzfs/sys/zfs_quota.h
 include/libzfs/sys/zfs_ratelimit.h
+include/libzfs/sys/zfs_refcount.h
 include/libzfs/sys/zfs_rlock.h
 include/libzfs/sys/zfs_sa.h
 include/libzfs/sys/zfs_stat.h
@@ -480,6 +480,7 @@
 sbin/zstream
 sbin/zstreamdump
 sbin/ztest
+share/pam-configs/zfs_key
 %%TESTS%%share/zfs/common.sh
 %%TESTS%%share/zfs/runfiles/common.run
 %%TESTS%%share/zfs/runfiles/freebsd.run
@@ -662,6 +663,9 @@
 %%TESTS%%share/zfs/zfs-tests/tests/functional/channel_program/lua_core/tst.return_nvlist_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/channel_program/lua_core/tst.return_recursive_table.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/channel_program/lua_core/tst.return_recursive_table.zcp
+%%TESTS%%share/zfs/zfs-tests/tests/functional/channel_program/lua_core/tst.stack_gsub.err
+%%TESTS%%share/zfs/zfs-tests/tests/functional/channel_program/lua_core/tst.stack_gsub.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/channel_program/lua_core/tst.stack_gsub.zcp
 %%TESTS%%share/zfs/zfs-tests/tests/functional/channel_program/lua_core/tst.timeout.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/channel_program/lua_core/tst.timeout.zcp
 %%TESTS%%share/zfs/zfs-tests/tests/functional/channel_program/synctask_core/cleanup.ksh
@@ -871,6 +875,10 @@
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_inherit/zfs_inherit_002_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_inherit/zfs_inherit_003_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_inherit/zfs_inherit_mountpoint.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_jail/cleanup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_jail/jail.conf
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_jail/setup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_jail/zfs_jail_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_load-key/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_load-key/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key.cfg
@@ -2331,5 +2339,3 @@
 %%TESTS%%share/zfs/zfs.sh
 %%TESTS%%share/zfs/zimport.sh
 %%TESTS%%share/zfs/zloop.sh
-/usr/share/pam-configs/zfs_key
-@dir /usr/share/pam-configs