Index: sysutils/openzfs-kmod/Makefile
===================================================================
--- sysutils/openzfs-kmod/Makefile
+++ sysutils/openzfs-kmod/Makefile
@@ -17,15 +17,18 @@
 USE_GITHUB=	yes
 GH_ACCOUNT=	openzfs
 GH_PROJECT=	zfs
-GH_TAGNAME=	8583540c6
+GH_TAGNAME=	aa2778d10
 KMODTARGET?=	openzfs.ko
 
 PLIST_FILES=	${KMODDIR}/${KMODTARGET}
 
 OPTIONS_DEFINE=	DEBUG INVARIANTS GCOV
 OPTIONS_SUB=	yes
+
 GCOV_DESC=	Build kernel module with GCOV support (Requires gcc)
-INVARIANTS_DESC=Build kernel module with INVARIANTS
+
+INVARIANTS_DESC=	Build kernel module with INVARIANTS
+INVARIANTS_IMPLIES=	DEBUG
 
 .include <bsd.port.pre.mk>
 
@@ -33,6 +36,10 @@
 IGNORE=	needs FreeBSD 12/13 with AES-CCM support
 .endif
 
+.if ${OSVERSION} >= 1300000
+OPTIONS_DEFAULT=	DEBUG INVARIANTS
+.endif
+
 MAKE_OPTS+=	SYSDIR=${SRC_BASE}/sys
 
 .if ${PORT_OPTIONS:MDEBUG}
Index: sysutils/openzfs-kmod/distinfo
===================================================================
--- sysutils/openzfs-kmod/distinfo
+++ sysutils/openzfs-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1606843093
-SHA256 (openzfs-zfs-v2020120100-8583540c6_GH0.tar.gz) = 41b097e017ab6a9003291e1422769315ddf2ef510848819a37fd35713458c5e9
-SIZE (openzfs-zfs-v2020120100-8583540c6_GH0.tar.gz) = 9559144
+TIMESTAMP = 1606856053
+SHA256 (openzfs-zfs-v2020120100-aa2778d10_GH0.tar.gz) = d32390f0628966b406774cacc1ecf271e285aef6c7dfa55fdc73800e7c624344
+SIZE (openzfs-zfs-v2020120100-aa2778d10_GH0.tar.gz) = 31293387
Index: sysutils/openzfs/Makefile
===================================================================
--- sysutils/openzfs/Makefile
+++ sysutils/openzfs/Makefile
@@ -20,15 +20,14 @@
 CONFIGURE_ARGS=	--prefix=${PREFIX} --with-config="user"
 
 OPTIONS_DEFINE=	DEBUG PYTHON TESTS
-DEBUG_DESC=	Build a debug configuration
-PYTHON_DESC=	Build the pyzfs library, arc_summary and arcstat utilities
+PYTHON_DESC=	Build the pyzfs library, arc_summary, arcstat, and dbufstat utilities
 TESTS_DESC=	Install the ZFS Test Suite
 OPTIONS_SUB=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	openzfs
 GH_PROJECT=	zfs
-GH_TAGNAME=	52c853751
+GH_TAGNAME=	aa2778d10
 
 .include <bsd.port.pre.mk>
 
Index: sysutils/openzfs/distinfo
===================================================================
--- sysutils/openzfs/distinfo
+++ sysutils/openzfs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1606842196
-SHA256 (openzfs-zfs-v2020120100-52c853751_GH0.tar.gz) = 9ca0fc8990811407ce0c321f05162bc848e416b2350383a8b52fe07eb7eb7f3a
-SIZE (openzfs-zfs-v2020120100-52c853751_GH0.tar.gz) = 31293506
+TIMESTAMP = 1606856244
+SHA256 (openzfs-zfs-v2020120100-aa2778d10_GH0.tar.gz) = d32390f0628966b406774cacc1ecf271e285aef6c7dfa55fdc73800e7c624344
+SIZE (openzfs-zfs-v2020120100-aa2778d10_GH0.tar.gz) = 31293387