diff --git a/security/easy-rsa/Makefile b/security/easy-rsa/Makefile
index 9eda71b01c86..6764a49dc30a 100644
--- a/security/easy-rsa/Makefile
+++ b/security/easy-rsa/Makefile
@@ -1,13 +1,11 @@
 PORTNAME=	easy-rsa
-DISTVERSION=	3.2.1
-PORTREVISION=	3
+DISTVERSION=	3.2.2
+PORTREVISION=	0  # leave in if 0 to avoid accidental PORTEPOCH bumps
 PORTEPOCH=	1
 CATEGORIES=	security net-mgmt
 MASTER_SITES=	https://github.com/OpenVPN/easy-rsa/releases/download/v${DISTVERSION}/ \
-		LOCAL/mandree/ \
-		https://github.com/OpenVPN/easy-rsa/raw/refs/tags/v${DISTVERSION}/dev/:lib
-DISTFILES=	${EXTRACT_ONLY} easyrsa-tools.lib:lib
-EXTRACT_ONLY=	EasyRSA-${DISTVERSION}${EXTRACT_SUFX}
+		LOCAL/mandree/
+DISTFILES=	EasyRSA-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Small RSA key management package based on openssl
@@ -27,7 +25,7 @@ SUB_FILES=	pkg-message
 WRKSRC=		${WRKDIR}/EasyRSA-${DISTVERSION}
 
 PORTDATA=	x509-types/
-_pd_files=	ChangeLog COPYING.md README.md README.quickstart.md mktemp.txt
+_pd_files=	ChangeLog COPYING.md README.md README.quickstart.md
 _pd_dirs=	doc/
 PORTDOCS=	${_pd_dirs} ${_pd_files}
 
@@ -37,7 +35,6 @@ do-install:
 		${MKDIR} ${STAGEDIR}${PREFIX}/bin
 		${MKDIR} ${STAGEDIR}${DATADIR}/x509-types/
 		${INSTALL_SCRIPT} ${WRKSRC}/easyrsa ${STAGEDIR}${PREFIX}/bin/
-		${INSTALL_SCRIPT} ${DISTDIR}/easyrsa-tools.lib ${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
diff --git a/security/easy-rsa/distinfo b/security/easy-rsa/distinfo
index 498e541e5377..4edd086715aa 100644
--- a/security/easy-rsa/distinfo
+++ b/security/easy-rsa/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1727863160
-SHA256 (EasyRSA-3.2.1.tgz) = ec0fdca46c07afef341e0e0eeb2bf0cfe74a11322b77163e5d764d28cb4eec89
-SIZE (EasyRSA-3.2.1.tgz) = 79917
-SHA256 (easyrsa-tools.lib) = eea232959d41f49330e032bf94a49b4b6b0574d75e199dd219096f1739077b3e
-SIZE (easyrsa-tools.lib) = 24329
+TIMESTAMP = 1739481666
+SHA256 (EasyRSA-3.2.2.tgz) = 86c5a551566213dac83d402f2a08c897063ef3e12033cd331cb4903280283209
+SIZE (EasyRSA-3.2.2.tgz) = 86324
diff --git a/security/easy-rsa/files/patch-39928c3a99b394fa4ea84521c730446000cf03ba.diff b/security/easy-rsa/files/patch-39928c3a99b394fa4ea84521c730446000cf03ba.diff
deleted file mode 100644
index b06bf7720948..000000000000
--- a/security/easy-rsa/files/patch-39928c3a99b394fa4ea84521c730446000cf03ba.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index 36534c6ee079..000000000000
--- a/security/easy-rsa/files/patch-d059df33e74ef337c118044a1bf6c83828960688.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-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
- 
diff --git a/security/easy-rsa/pkg-plist b/security/easy-rsa/pkg-plist
index bf0c628cb0c2..ac7f3222a0b9 100644
--- a/security/easy-rsa/pkg-plist
+++ b/security/easy-rsa/pkg-plist
@@ -1,5 +1,4 @@
 bin/easyrsa
-bin/easyrsa-tools.lib
 bin/easy-rsa
 @sample %%DATADIR%%/openssl-easyrsa.cnf.example %%DATADIR%%/openssl-easyrsa.cnf
 %%DATADIR%%/vars.example