Index: head/sysutils/zol/Makefile
===================================================================
--- head/sysutils/zol/Makefile	(revision 496848)
+++ head/sysutils/zol/Makefile	(revision 496849)
@@ -1,41 +1,41 @@
 # $FreeBSD$
 
 PORTNAME=	zol
-PORTVERSION=	2019032100
+PORTVERSION=	2019032500
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
 MAINTAINER=	kmoore@FreeBSD.org
 COMMENT=	ZFS
 
 LICENSE=	CDDL
 
 RUN_DEPENDS=	zol-kmod>=0:sysutils/zol-kmod
 
 USES=		autoreconf:build libtool gmake gettext-runtime:run
 
 GNU_CONFIGURE=  yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --with-config="user"
 
 OPTIONS_DEFINE= DEBUG
 OPTIONS_SUB=    yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	zfsonfreebsd
 GH_PROJECT=	ZoF
-GH_TAGNAME=	8eab9ee
+GH_TAGNAME=	7ee98db
 
 .include <bsd.port.pre.mk>
 
 .if (${OSVERSION} < 1200504) || (${OSVERSION} >= 1300000 && ${OSVERSION} < 1300013)
 IGNORE=      needs FreeBSD 12/13 with AES-CCM support
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--enable-debug --enable-debuginfo
 .endif
 
 pre-configure:
 	cd ${WRKSRC} && ./autogen.sh
 
 .include <bsd.port.post.mk>
Index: head/sysutils/zol/distinfo
===================================================================
--- head/sysutils/zol/distinfo	(revision 496848)
+++ head/sysutils/zol/distinfo	(revision 496849)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1553183078
-SHA256 (zfsonfreebsd-ZoF-v2019032100-8eab9ee_GH0.tar.gz) = b2dc65e851b52ef76cc208f43ad0a5f1abea86e755b840ddfede06fed3367bc7
-SIZE (zfsonfreebsd-ZoF-v2019032100-8eab9ee_GH0.tar.gz) = 6455637
+TIMESTAMP = 1553528917
+SHA256 (zfsonfreebsd-ZoF-v2019032500-7ee98db_GH0.tar.gz) = d2ea83bdf9686b5fd98ffa1c4e122e8be96418f724df0546fec262391b96c198
+SIZE (zfsonfreebsd-ZoF-v2019032500-7ee98db_GH0.tar.gz) = 6448157
Index: head/sysutils/zol-kmod/Makefile
===================================================================
--- head/sysutils/zol-kmod/Makefile	(revision 496848)
+++ head/sysutils/zol-kmod/Makefile	(revision 496849)
@@ -1,50 +1,54 @@
 # $FreeBSD$
 
 PORTNAME=	zol
-PORTVERSION=	2019032100
+PORTVERSION=	2019032500
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-kmod
 
 MAINTAINER=	kmoore@FreeBSD.org
 COMMENT=	ZFS
 
 LICENSE=	CDDL
 
 USES=		kmod
 USE_GITHUB=	yes
 GH_ACCOUNT=	zfsonfreebsd
 GH_PROJECT=	ZoF
-GH_TAGNAME=	8eab9ee
+GH_TAGNAME=	7ee98db
 
 PLIST_FILES=	${KMODDIR}/zfs.ko
 
 OPTIONS_DEFINE=	DEBUG GCOV
 OPTIONS_SUB=	yes
 GCOV_DESC=	Build kernel module with GCOV support (Requires gcc)
 
 .include <bsd.port.pre.mk>
 
 .if (${OSVERSION} < 1200504) || (${OSVERSION} >= 1300000 && ${OSVERSION} < 1300013)
 IGNORE=      needs FreeBSD 12/13 with AES-CCM support
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 MAKE_OPTS+=	WITH_DEBUG=true
+PLIST_FILES+=	${KMODDIR}/zfs.ko.debug
 .endif
 
 .if ${PORT_OPTIONS:MGCOV}
 USE_GCC=yes
 MAKE_OPTS+=	WITH_GCOV=true
 .endif
 
 post-patch:
 	${CP} ${FILESDIR}/zfs_gitrev.h ${WRKSRC}/include
 
 do-build:
 	(cd ${WRKSRC}/module/ && make -f Makefile.bsd CC=${CC} ${MAKE_OPTS})
 
 do-install:
 	${INSTALL} ${WRKSRC}/module/zfs.ko ${STAGEDIR}${KMODDIR}
+.if ${PORT_OPTIONS:MDEBUG}
+	${INSTALL} ${WRKSRC}/module/zfs.ko.debug ${STAGEDIR}${KMODDIR}
+.endif
 
 .include <bsd.port.post.mk>
Index: head/sysutils/zol-kmod/distinfo
===================================================================
--- head/sysutils/zol-kmod/distinfo	(revision 496848)
+++ head/sysutils/zol-kmod/distinfo	(revision 496849)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1553183435
-SHA256 (zfsonfreebsd-ZoF-v2019032100-8eab9ee_GH0.tar.gz) = b2dc65e851b52ef76cc208f43ad0a5f1abea86e755b840ddfede06fed3367bc7
-SIZE (zfsonfreebsd-ZoF-v2019032100-8eab9ee_GH0.tar.gz) = 6455637
+TIMESTAMP = 1553528901
+SHA256 (zfsonfreebsd-ZoF-v2019032500-7ee98db_GH0.tar.gz) = d2ea83bdf9686b5fd98ffa1c4e122e8be96418f724df0546fec262391b96c198
+SIZE (zfsonfreebsd-ZoF-v2019032500-7ee98db_GH0.tar.gz) = 6448157