diff --git a/security/easy-rsa/Makefile b/security/easy-rsa/Makefile
index a5863bfd61f2..33aedcf09fd4 100644
--- a/security/easy-rsa/Makefile
+++ b/security/easy-rsa/Makefile
@@ -1,51 +1,53 @@
 PORTNAME=	easy-rsa
+DISTVERSION=	3.2.1
+PORTREVISION=	0
 PORTEPOCH=	1
-DISTVERSION=	3.1.7
 CATEGORIES=	security net-mgmt
 MASTER_SITES=	https://github.com/OpenVPN/easy-rsa/releases/download/v${DISTVERSION}/ \
 		LOCAL/mandree/
 DISTNAME=	EasyRSA-${DISTVERSION}
 
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Small RSA key management package based on openssl
 WWW=		https://github.com/OpenVPN/easy-rsa
 
 LICENSE=	GPLv2
 
 USES=		tar:tgz
 
-CONFLICTS_INSTALL=easy-rsa2
+PATCH_STRIP=	-p1
 
-NO_BUILD=	yes
 NO_ARCH=	yes
+NO_BUILD=	yes
 
-WRKSRC=		${WRKDIR}/EasyRSA-${DISTVERSION}
+SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=		DOCS EXAMPLES
+WRKSRC=		${WRKDIR}/EasyRSA-${DISTVERSION}
 
 PORTDATA=	x509-types/
 _pd_files=	ChangeLog COPYING.md README.md README.quickstart.md mktemp.txt
 _pd_dirs=	doc/
-PORTDOCS=	${_pd_files} ${_pd_dirs}
-SUB_FILES=	pkg-message
+PORTDOCS=	${_pd_dirs} ${_pd_files}
+
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
 		${MKDIR} ${STAGEDIR}${PREFIX}/bin
 		${MKDIR} ${STAGEDIR}${DATADIR}/x509-types/
 		${INSTALL_SCRIPT} ${WRKSRC}/easyrsa ${STAGEDIR}${PREFIX}/bin/
 		${LN} -fh ${STAGEDIR}${PREFIX}/bin/easyrsa ${STAGEDIR}${PREFIX}/bin/easy-rsa
 		${INSTALL_DATA} ${WRKSRC}/vars.example ${STAGEDIR}${DATADIR}/
 		${INSTALL_DATA} ${WRKSRC}/openssl-easyrsa.cnf ${STAGEDIR}${DATADIR}/openssl-easyrsa.cnf.example
 		(cd ${WRKSRC}/x509-types/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/x509-types/)
 
 do-install-DOCS-on:
 		${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${_pd_files}
 		${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 .for i in ${_pd_dirs}
 		${MKDIR} ${STAGEDIR}${DOCSDIR}/${i}
 		(cd ${WRKSRC}/${i} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/${i})
 .endfor
 
 .include <bsd.port.mk>
diff --git a/security/easy-rsa/distinfo b/security/easy-rsa/distinfo
index 2c6d7f89d628..ecde3c007010 100644
--- a/security/easy-rsa/distinfo
+++ b/security/easy-rsa/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1697487333
-SHA256 (EasyRSA-3.1.7.tgz) = aaa48fadcbb77511b9c378554ef3eae09f8c7bc149d6f56ba209f1c9bab98c6e
-SIZE (EasyRSA-3.1.7.tgz) = 81373
+TIMESTAMP = 1726777433
+SHA256 (EasyRSA-3.2.1.tgz) = ec0fdca46c07afef341e0e0eeb2bf0cfe74a11322b77163e5d764d28cb4eec89
+SIZE (EasyRSA-3.2.1.tgz) = 79917
diff --git a/security/easy-rsa/files/patch-39928c3a99b394fa4ea84521c730446000cf03ba.diff b/security/easy-rsa/files/patch-39928c3a99b394fa4ea84521c730446000cf03ba.diff
new file mode 100644
index 000000000000..b06bf7720948
--- /dev/null
+++ b/security/easy-rsa/files/patch-39928c3a99b394fa4ea84521c730446000cf03ba.diff
@@ -0,0 +1,12 @@
+diff --git a/ChangeLog b/ChangeLog
+index 1e72d1ed..2790f2c9 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,6 +1,6 @@
+ Easy-RSA 3 ChangeLog
+ 
+-3.2.1 (TBD)
++3.2.1 (2024-09-13)
+ 
+    * inline: Add decimal value for cert. serial (Linux Only) (b33038e) (#1222)
+    * Always exit with error for unknown command options (Except nopass) (#1221)
diff --git a/security/easy-rsa/files/patch-d059df33e74ef337c118044a1bf6c83828960688.diff b/security/easy-rsa/files/patch-d059df33e74ef337c118044a1bf6c83828960688.diff
new file mode 100644
index 000000000000..36534c6ee079
--- /dev/null
+++ b/security/easy-rsa/files/patch-d059df33e74ef337c118044a1bf6c83828960688.diff
@@ -0,0 +1,13 @@
+diff --git a/README.md b/README.md
+index eac4ca7e..d7c3074c 100644
+--- a/README.md
++++ b/README.md
+@@ -26,7 +26,7 @@ seek help using Easy-RSA:
+ The [openvpn-users mailing list](https://lists.sourceforge.net/lists/listinfo/openvpn-users)
+ is a good place to post usage or help questions.
+ 
+-You can also try libera.chat IRC network, in channels #openvpn for general support or #easyrsa for development discussion.
++Users of GitHub can report problems to the Easy-RSA `issues` list.
+ 
+ # Branch structure
+