diff --git a/filesystems/openzfs-kmod/Makefile b/filesystems/openzfs-kmod/Makefile
index bda6240d01bd..ab7dc7c854b0 100644
--- a/filesystems/openzfs-kmod/Makefile
+++ b/filesystems/openzfs-kmod/Makefile
@@ -1,67 +1,66 @@
 PORTNAME=	openzfs
-PORTVERSION=	2.3.1
-PORTREVISION=	1
+PORTVERSION=	2.3.2
 PORTEPOCH=	1
 CATEGORIES=	filesystems sysutils
 MASTER_SITES=	https://github.com/openzfs/zfs/releases/download/zfs-${PORTVERSION}/
 PKGNAMESUFFIX?=	-kmod
 DISTNAME=	zfs-${DISTVERSION}
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	OpenZFS kernel module for FreeBSD
 WWW=		https://github.com/openzfs/zfs
 
 LICENSE=	CDDL
 
 USES=		cpe kmod
 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=	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}"' > ${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}/openzfs.ko ${STAGEDIR}${KMODDIR}/${KMODTARGET}
 .if ${PORT_OPTIONS:MDEBUG}
 	${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 2a6804bb1826..85cc41a1f8f4 100644
--- a/filesystems/openzfs-kmod/distinfo
+++ b/filesystems/openzfs-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743064954
-SHA256 (zfs-2.3.1.tar.gz) = 053233799386920bdc636e22d0e19a8c2c3e642e8bd847ff87e108f8bb1f9006
-SIZE (zfs-2.3.1.tar.gz) = 34048716
+TIMESTAMP = 1746395184
+SHA256 (zfs-2.3.2.tar.gz) = 80da628a9543ec3355bf410617450e167706948ceb287541455a1b8d87b8758a
+SIZE (zfs-2.3.2.tar.gz) = 34344259
diff --git a/filesystems/openzfs-kmod/files/patch-Makefile.bsd b/filesystems/openzfs-kmod/files/patch-Makefile.bsd
deleted file mode 100644
index 4b4d727ff7e4..000000000000
--- a/filesystems/openzfs-kmod/files/patch-Makefile.bsd
+++ /dev/null
@@ -1,69 +0,0 @@
---- Makefile.bsd.orig	2025-03-10 22:54:55 UTC
-+++ Makefile.bsd
-@@ -90,19 +90,25 @@ SRCS+=	blake3.c \
- 	blake3_generic.c \
- 	blake3_impl.c
- 
-+.if ${MACHINE_ARCH} == "aarch64"
- #icp/asm-aarch64/blake3
- SRCS+=	b3_aarch64_sse2.S \
- 	b3_aarch64_sse41.S
-+.endif
- 
-+.if ${MACHINE_ARCH} == "powerpc64le"
- #icp/asm-ppc64/blake3
- SRCS+=	b3_ppc64le_sse2.S \
- 	b3_ppc64le_sse41.S
-+.endif
- 
-+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
- #icp/asm-x86_64/blake3
- SRCS+=	blake3_avx2.S \
- 	blake3_avx512.S \
- 	blake3_sse2.S \
- 	blake3_sse41.S
-+.endif
- 
- #icp/algs/edonr
- SRCS+=	edonr.c
-@@ -112,23 +118,31 @@ SRCS+=	sha256_impl.c \
- 	sha2_generic.c \
- 	sha512_impl.c
- 
-+.if ${MACHINE_ARCH} == "armv7"
- #icp/asm-arm/sha2
- SRCS+=	sha256-armv7.S \
- 	sha512-armv7.S
-+.endif
- 
-+.if ${MACHINE_ARCH} == "aarch64"
- #icp/asm-aarch64/sha2
- SRCS+=	sha256-armv8.S \
- 	sha512-armv8.S
-+.endif
- 
-+.if ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "powerpc64le"
- #icp/asm-ppc64/sha2
- SRCS+=	sha256-p8.S \
- 	sha256-ppc.S \
- 	sha512-p8.S \
- 	sha512-ppc.S
-+.endif
- 
-+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
- #icp/asm-x86_64/sha2
- SRCS+=	sha256-x86_64.S \
- 	sha512-x86_64.S
-+.endif
- 
- #lua
- SRCS+=	lapi.c \
-@@ -506,7 +520,7 @@ CFLAGS.zstd_opt.c= -U__BMI__ -fno-tree-vectorize ${NO_
- CFLAGS.zstd_ldm.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
- CFLAGS.zstd_opt.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
- 
--.if ${MACHINE_CPUARCH} == "aarch64"
-+.if ${MACHINE_ARCH} == "aarch64"
- __ZFS_ZSTD_AARCH64_FLAGS= -include ${SRCDIR}/zstd/include/aarch64_compat.h
- CFLAGS.zstd.c+= ${__ZFS_ZSTD_AARCH64_FLAGS}
- CFLAGS.entropy_common.c+= ${__ZFS_ZSTD_AARCH64_FLAGS}