diff --git a/filesystems/openzfs-kmod/Makefile b/filesystems/openzfs-kmod/Makefile
index 63bf3ad7f787..98d14d3151b8 100644
--- a/filesystems/openzfs-kmod/Makefile
+++ b/filesystems/openzfs-kmod/Makefile
@@ -1,68 +1,66 @@
 PORTNAME=	openzfs
-PORTVERSION=	2023113000
-DISTVERSIONPREFIX=	v
+PORTVERSION=	2.3.1
+PORTEPOCH=	1
 CATEGORIES=	filesystems sysutils
+MASTER_SITES=	https://github.com/openzfs/zfs/releases/download/zfs-${PORTVERSION}/
 PKGNAMESUFFIX?=	-kmod
+DISTNAME=	zfs-${DISTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mm@FreeBSD.org
 COMMENT=	OpenZFS kernel module for FreeBSD
 WWW=		https://github.com/openzfs/zfs
 
 LICENSE=	CDDL
 
-BROKEN=	build fails
-
 USES=		cpe kmod
-USE_GITHUB=	yes
-GH_PROJECT=	zfs
-GH_TAGNAME=	494aaae
+OPENZFS_TAGNAME=	f3e4043a3
 KMODTARGET?=	openzfs.ko
 
 PLIST_FILES=	${KMODDIR}/${KMODTARGET}
 
 OPTIONS_DEFINE=	DEBUG INVARIANTS GCOV
 OPTIONS_DEFAULT=	DEBUG INVARIANTS
 OPTIONS_SUB=	yes
 
 GCOV_DESC=	Build kernel module with GCOV support (Requires gcc)
 
 INVARIANTS_DESC=	Build kernel module with INVARIANTS
 INVARIANTS_IMPLIES=	DEBUG
 
+WRKSRC_SUBDIR=	module
+MAKEFILE=	Makefile.bsd
+
 .include <bsd.port.options.mk>
 
 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}
+ZFS_META_GITREV=	zfs-${PORTVERSION}-0-g${OPENZFS_TAGNAME}-dist
+ZFS_META_RELEASE=	1
+ZFS_META_VERSION=	${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})
+	${ECHO} '#define ZFS_META_GITREV "${ZFS_META_GITREV}"' > ${WRKDIR}/${DISTNAME}/include/zfs_gitrev.h
+	${ECHO} '#define ZFS_META_RELEASE "${ZFS_META_RELEASE}"' > ${WRKDIR}/${DISTNAME}/zfs_config.h
+	${ECHO} '#define ZFS_META_VERSION "${ZFS_META_VERSION}"' >> ${WRKDIR}/${DISTNAME}/zfs_config.h
 
 do-install:
-	${INSTALL} ${WRKSRC}/module/openzfs.ko ${STAGEDIR}${KMODDIR}/${KMODTARGET}
+	${INSTALL} ${WRKSRC}/openzfs.ko ${STAGEDIR}${KMODDIR}/${KMODTARGET}
 .if ${PORT_OPTIONS:MDEBUG}
-	${INSTALL} ${WRKSRC}/module/openzfs.ko.debug ${STAGEDIR}${KMODDIR}/${KMODTARGET}.debug
+	${INSTALL} ${WRKSRC}/openzfs.ko.debug ${STAGEDIR}${KMODDIR}/${KMODTARGET}.debug
 .endif
 
 .include <bsd.port.mk>
diff --git a/filesystems/openzfs-kmod/distinfo b/filesystems/openzfs-kmod/distinfo
index 46df98bb02c8..2a6804bb1826 100644
--- a/filesystems/openzfs-kmod/distinfo
+++ b/filesystems/openzfs-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1701967598
-SHA256 (openzfs-zfs-v2023113000-494aaae_GH0.tar.gz) = 7f77e73bacb7bb081e3344fb20e5ebffd6a6c0b10cad1b6c572d44866a94eea6
-SIZE (openzfs-zfs-v2023113000-494aaae_GH0.tar.gz) = 33039586
+TIMESTAMP = 1743064954
+SHA256 (zfs-2.3.1.tar.gz) = 053233799386920bdc636e22d0e19a8c2c3e642e8bd847ff87e108f8bb1f9006
+SIZE (zfs-2.3.1.tar.gz) = 34048716