diff --git a/sysutils/openzfs-kmod/Makefile b/sysutils/openzfs-kmod/Makefile
index e7bebf4065fa..f7693248db3d 100644
--- a/sysutils/openzfs-kmod/Makefile
+++ b/sysutils/openzfs-kmod/Makefile
@@ -1,71 +1,72 @@
 PORTNAME=	openzfs
 PORTVERSION=	2023012600
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	sysutils
 PKGNAMESUFFIX?=	-kmod
 
 MAINTAINER=	freqlabs@FreeBSD.org
 COMMENT=	OpenZFS kernel module for FreeBSD
-WWW=		https://github.com/zfsonfreebsd/ZoF
+WWW=		https://github.com/openzfs/zfs
 
 LICENSE=	CDDL
 
 BROKEN_i386=	build fails
 
 USES=		cpe kmod
 USE_GITHUB=	yes
 GH_PROJECT=	zfs
 GH_TAGNAME=	dc5c8006f
 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_IMPLIES=	DEBUG
 
 .include <bsd.port.options.mk>
 
 .if ${OSVERSION} >= 1300000
 OPTIONS_DEFAULT=	DEBUG INVARIANTS
 .endif
 
 MAKE_OPTS+=	SYSDIR=${SRC_BASE}/sys
 
 .if ${PORT_OPTIONS:MDEBUG}
 MAKE_OPTS+=	WITH_DEBUG=true
 PLIST_FILES+=	${KMODDIR}/${KMODTARGET}.debug
 .endif
 
 .if ${PORT_OPTIONS:MINVARIANTS}
 MAKE_OPTS+=	WITH_INVARIANTS=true
 .endif
 
 .if ${PORT_OPTIONS:MGCOV}
 USE_GCC=	yes
 MAKE_OPTS+=	WITH_GCOV=true
 .endif
 
 ZFS_META_GITREV=	${GH_PROJECT}-${GH_TAGNAME}
 ZFS_META_RELEASE=	${GH_PROJECT}_${GH_TAGNAME}
 ZFS_META_VERSION=	${DISTVERSIONPREFIX}${PORTVERSION}
 
 post-patch:
 	${ECHO} '#define ZFS_META_GITREV "${ZFS_META_GITREV}"' > ${WRKSRC}/include/zfs_gitrev.h
 	${ECHO} '#define ZFS_META_RELEASE "${ZFS_META_RELEASE}"' > ${WRKSRC}/zfs_config.h
 	${ECHO} '#define ZFS_META_VERSION "${ZFS_META_VERSION}"' >> ${WRKSRC}/zfs_config.h
 
 do-build:
 	(cd ${WRKSRC}/module/ && make -f Makefile.bsd CC=${CC} ${MAKE_OPTS})
 
 do-install:
 	${INSTALL} ${WRKSRC}/module/openzfs.ko ${STAGEDIR}${KMODDIR}/${KMODTARGET}
 .if ${PORT_OPTIONS:MDEBUG}
 	${INSTALL} ${WRKSRC}/module/openzfs.ko.debug ${STAGEDIR}${KMODDIR}/${KMODTARGET}.debug
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/openzfs/Makefile b/sysutils/openzfs/Makefile
index 2e767f812a9a..6ba1c17d5e03 100644
--- a/sysutils/openzfs/Makefile
+++ b/sysutils/openzfs/Makefile
@@ -1,66 +1,68 @@
 PORTNAME=	openzfs
 PORTVERSION=	2023012600
-PORTREVISION=	1
 DISTVERSIONPREFIX=	v
+PORTREVISION=	2
 CATEGORIES=	sysutils
 
 MAINTAINER=	freqlabs@FreeBSD.org
 COMMENT=	OpenZFS userland for FreeBSD
-WWW=		https://github.com/zfsonfreebsd/ZoF
+WWW=		https://github.com/openzfs/zfs
 
 LICENSE=	CDDL
 
 BROKEN_aarch64=	invokes x86 assembler
 BROKEN_riscv64=	fails to compile: btree_test.c:462:49: result of comparison of constant -1 with expression of type 'char' is always true
 
 BUILD_DEPENDS=	ksh93:shells/ksh93
 RUN_DEPENDS=	openzfs-kmod>=0:sysutils/openzfs-kmod
 
 USES+=		autoreconf:build cpe libtool gmake gettext-runtime python:3.3+,build shebangfix
 SHEBANG_GLOB=	*.ksh *.ksh.in *.kshlib *.py.in
 SHEBANG_FILES=	tests/zfs-tests/tests/functional/trim/trim.cfg \
 		cmd/arcstat.in \
 		cmd/dbufstat.in \
 		cmd/arc_summary
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	MAKE=gmake --prefix=${PREFIX} --with-config="user"
 
 OPTIONS_DEFINE=	DEBUG PYTHON TESTS
 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_PROJECT=	zfs
 GH_TAGNAME=	dc5c8006f
 
+USE_LDCONFIG=	yes
+
 .include <bsd.port.options.mk>
 
 .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}packaging>0:devel/py-packaging@${PY_FLAVOR}
 BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${PY_FLAVOR}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${PY_FLAVOR}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sysctl>0:devel/py-sysctl@${PY_FLAVOR}
 .else
 CONFIGURE_ARGS+=	--without-python
 PYTHON_NO_DEPENDS=yes
 .endif
 
 post-extract:
 	# Change certain shebangs into something that shebang fix understands
-	cd ${WRKSRC} && sed -i '' '1s:@PYTHON_SHEBANG@:python3:' \
+	cd ${WRKSRC} && ${SED} -i '' '1s:@PYTHON_SHEBANG@:python3:' \
 		tests/test-runner/bin/zts-report.py.in \
 		tests/test-runner/bin/test-runner.py.in \
 		cmd/arcstat.in \
 		cmd/dbufstat.in
 
 pre-configure:
 	cd ${WRKSRC} && ./autogen.sh
 
 .include <bsd.port.mk>
diff --git a/sysutils/openzfs/pkg-message b/sysutils/openzfs/pkg-message
index 1447ef490598..1101f72fc507 100644
--- a/sysutils/openzfs/pkg-message
+++ b/sysutils/openzfs/pkg-message
@@ -1,11 +1,11 @@
 [
 { type: install
   message: <<EOM
 Ensure that any zfs-related commands, such as zpool, zfs, as used in scripts
-and in your terminal sessions, use the correct path of /usr/local/sbin/ and
+and in your terminal sessions, use the correct path of ${PREFIX}/sbin/ and
 not the /sbin/ commands provided by the FreeBSD base system.
 
 Consider setting this in your shell profile defaults!
 EOM
 }
 ]