Index: head/sysutils/openzfs-kmod/Makefile
===================================================================
--- head/sysutils/openzfs-kmod/Makefile
+++ head/sysutils/openzfs-kmod/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	openzfs
-PORTVERSION=	2020050800
+PORTVERSION=	2020060300
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 PKGNAMESUFFIX?=	-kmod
@@ -11,11 +11,13 @@
 
 LICENSE=	CDDL
 
+BROKEN_i386=	build fails
+
 USES=		kmod
 USE_GITHUB=	yes
 GH_ACCOUNT=	openzfs
 GH_PROJECT=	zfs
-GH_TAGNAME=	1cc635a2d
+GH_TAGNAME=	c0eb5c35e
 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 = 1588929327
-SHA256 (openzfs-zfs-v2020050800-1cc635a2d_GH0.tar.gz) = 0f028b67db864b872227a726a12c07eab342e6d0b5936756d612e2c7796f8706
-SIZE (openzfs-zfs-v2020050800-1cc635a2d_GH0.tar.gz) = 9165133
+TIMESTAMP = 1591206915
+SHA256 (openzfs-zfs-v2020060300-c0eb5c35e_GH0.tar.gz) = 91f65373ccb618aa31f44f998ed0d7474b52591befbc3eb8bc73fbf81e4b2dde
+SIZE (openzfs-zfs-v2020060300-c0eb5c35e_GH0.tar.gz) = 9171145
Index: head/sysutils/openzfs/Makefile
===================================================================
--- head/sysutils/openzfs/Makefile
+++ head/sysutils/openzfs/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	openzfs
-PORTVERSION=	2020050800
+PORTVERSION=	2020060300
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
@@ -28,7 +28,7 @@
 USE_GITHUB=	yes
 GH_ACCOUNT=	openzfs
 GH_PROJECT=	zfs
-GH_TAGNAME=	1cc635a2d
+GH_TAGNAME=	c0eb5c35e
 
 .include <bsd.port.pre.mk>
 
Index: head/sysutils/openzfs/distinfo
===================================================================
--- head/sysutils/openzfs/distinfo
+++ head/sysutils/openzfs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1588929388
-SHA256 (openzfs-zfs-v2020050800-1cc635a2d_GH0.tar.gz) = 0f028b67db864b872227a726a12c07eab342e6d0b5936756d612e2c7796f8706
-SIZE (openzfs-zfs-v2020050800-1cc635a2d_GH0.tar.gz) = 9165133
+TIMESTAMP = 1591206993
+SHA256 (openzfs-zfs-v2020060300-c0eb5c35e_GH0.tar.gz) = 91f65373ccb618aa31f44f998ed0d7474b52591befbc3eb8bc73fbf81e4b2dde
+SIZE (openzfs-zfs-v2020060300-c0eb5c35e_GH0.tar.gz) = 9171145
Index: head/sysutils/openzfs/pkg-plist
===================================================================
--- head/sysutils/openzfs/pkg-plist
+++ head/sysutils/openzfs/pkg-plist
@@ -135,6 +135,7 @@
 include/libzfs/libzfs_impl.h
 include/libzfs/libzutil.h
 include/libzfs/sys/abd.h
+include/libzfs/sys/abd_impl.h
 include/libzfs/sys/aggsum.h
 include/libzfs/sys/arc.h
 include/libzfs/sys/arc_impl.h
@@ -371,6 +372,7 @@
 libexec/zfs/zpool.d/vendor
 libexec/zfs/zpool.d/w_proc
 libexec/zfs/zpool.d/w_ucor
+man/man1/arcstat.1.gz
 %%TESTS%%man/man1/raidz_test.1.gz
 %%TESTS%%man/man1/test-runner.1.gz
 man/man1/zhack.1.gz
@@ -424,6 +426,7 @@
 man/man8/zfs-userspace.8.gz
 man/man8/zfs-wait.8.gz
 man/man8/zfs.8.gz
+man/man8/zfs_ids_to_path.8.gz
 man/man8/zfsconcepts.8.gz
 man/man8/zfsprops.8.gz
 man/man8/zinject.8.gz
@@ -466,6 +469,7 @@
 sbin/fsck.zfs
 sbin/zdb
 sbin/zfs
+sbin/zfs_ids_to_path
 sbin/zhack
 sbin/zinject
 sbin/zpool
@@ -854,6 +858,9 @@
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_010_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_common.kshlib
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_list_d.kshlib
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_ids_to_path/cleanup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_ids_to_path/setup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_ids_to_path/zfs_ids_to_path_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_inherit/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_inherit/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_inherit/zfs_inherit_001_neg.ksh
@@ -2016,6 +2023,7 @@
 %%TESTS%%share/zfs/zfs-tests/tests/functional/resilver/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/resilver/resilver.cfg
 %%TESTS%%share/zfs/zfs-tests/tests/functional/resilver/resilver_restart_001.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/resilver/resilver_restart_002.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/resilver/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rootpool/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rootpool/rootpool_002_neg.ksh