Index: head/sysutils/zol/Makefile
===================================================================
--- head/sysutils/zol/Makefile	(revision 502280)
+++ head/sysutils/zol/Makefile	(revision 502281)
@@ -1,56 +1,56 @@
 # $FreeBSD$
 
 PORTNAME=	zol
-PORTVERSION=	2019050600
+PORTVERSION=	2019052200
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
 MAINTAINER=	kmoore@FreeBSD.org
 COMMENT=	ZFS on Linux userland for FreeBSD
 
 LICENSE=	CDDL
 
 BROKEN_aarch64=	invokes x86 assembler
 
 RUN_DEPENDS=	zol-kmod>=0:sysutils/zol-kmod
 
 USES+=		autoreconf:build libtool gmake gettext-runtime:run python:3.3+,build shebangfix
 
 GNU_CONFIGURE=  yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --with-config="user"
 
 OPTIONS_DEFINE= DEBUG PYTHON
 OPTIONS_SUB=    yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	zfsonfreebsd
 GH_PROJECT=	ZoF
-GH_TAGNAME=	52a3f3c
+GH_TAGNAME=	501cfe1
 
 .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
 
 .if ${PORT_OPTIONS:MPYTHON}
 CONFIGURE_ARGS+=	--with-python=${PYTHON_VER}
 BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${PY_FLAVOR}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${PY_FLAVOR}
 PLIST_SUB+=     PYTHON=""
 .else
 CONFIGURE_ARGS+=	--without-python --disable-pyzfs
 PLIST_SUB+=     PYTHON="@comment "
 .endif
 
 pre-configure:
 	cd ${WRKSRC} && ./autogen.sh
 
 post-stage:
 	${RM} -rf ${STAGEDIR}/usr/lib
 
 .include <bsd.port.post.mk>
Index: head/sysutils/zol/distinfo
===================================================================
--- head/sysutils/zol/distinfo	(revision 502280)
+++ head/sysutils/zol/distinfo	(revision 502281)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1557191491
-SHA256 (zfsonfreebsd-ZoF-v2019050600-52a3f3c_GH0.tar.gz) = 4159cd4f869f835b628a2896e0acd7fe0415dc1b062443f3d6c5cb65e3f896ac
-SIZE (zfsonfreebsd-ZoF-v2019050600-52a3f3c_GH0.tar.gz) = 6741091
+TIMESTAMP = 1558543907
+SHA256 (zfsonfreebsd-ZoF-v2019052200-501cfe1_GH0.tar.gz) = 28a0ae7841b0623175494288a83b6344a574632cceee8e4d6dd6e6f56afa8839
+SIZE (zfsonfreebsd-ZoF-v2019052200-501cfe1_GH0.tar.gz) = 6741927
Index: head/sysutils/zol-kmod/Makefile
===================================================================
--- head/sysutils/zol-kmod/Makefile	(revision 502280)
+++ head/sysutils/zol-kmod/Makefile	(revision 502281)
@@ -1,54 +1,55 @@
 # $FreeBSD$
 
 PORTNAME=	zol
-PORTVERSION=	2019050600
+PORTVERSION=	2019052200
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
-PKGNAMESUFFIX=	-kmod
+PKGNAMESUFFIX?=	-kmod
 
 MAINTAINER=	kmoore@FreeBSD.org
 COMMENT=	ZFS on Linux kernel module for FreeBSD
 
 LICENSE=	CDDL
 
 USES=		kmod
 USE_GITHUB=	yes
 GH_ACCOUNT=	zfsonfreebsd
 GH_PROJECT=	ZoF
-GH_TAGNAME=	52a3f3c
+GH_TAGNAME=	501cfe1
+KMODTARGET?=	zfs.ko
 
-PLIST_FILES=	${KMODDIR}/zfs.ko
+PLIST_FILES=	${KMODDIR}/${KMODTARGET}
 
 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
+PLIST_FILES+=	${KMODDIR}/${KMODTARGET}.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}
+	${INSTALL} ${WRKSRC}/module/zfs.ko ${STAGEDIR}${KMODDIR}/${KMODTARGET}
 .if ${PORT_OPTIONS:MDEBUG}
-	${INSTALL} ${WRKSRC}/module/zfs.ko.debug ${STAGEDIR}${KMODDIR}
+	${INSTALL} ${WRKSRC}/module/zfs.ko.debug ${STAGEDIR}${KMODDIR}/${KMODTARGET}.debug
 .endif
 
 .include <bsd.port.post.mk>
Index: head/sysutils/zol-kmod/distinfo
===================================================================
--- head/sysutils/zol-kmod/distinfo	(revision 502280)
+++ head/sysutils/zol-kmod/distinfo	(revision 502281)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1557193056
-SHA256 (zfsonfreebsd-ZoF-v2019050600-52a3f3c_GH0.tar.gz) = 4159cd4f869f835b628a2896e0acd7fe0415dc1b062443f3d6c5cb65e3f896ac
-SIZE (zfsonfreebsd-ZoF-v2019050600-52a3f3c_GH0.tar.gz) = 6741091
+TIMESTAMP = 1558543926
+SHA256 (zfsonfreebsd-ZoF-v2019052200-501cfe1_GH0.tar.gz) = 28a0ae7841b0623175494288a83b6344a574632cceee8e4d6dd6e6f56afa8839
+SIZE (zfsonfreebsd-ZoF-v2019052200-501cfe1_GH0.tar.gz) = 6741927