diff --git a/security/easy-rsa/Makefile b/security/easy-rsa/Makefile
index 02cd6237fa37..8a3ff8cf0c9d 100644
--- a/security/easy-rsa/Makefile
+++ b/security/easy-rsa/Makefile
@@ -1,51 +1,49 @@
 PORTNAME=	easy-rsa
 DISTVERSION=	3.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security net-mgmt
 MASTER_SITES=	https://github.com/OpenVPN/easy-rsa/releases/download/v${DISTVERSION}/
 DISTNAME=	EasyRSA-${DISTVERSION}
 
-# Eric F. Crist <ecrist@secure-computing.net> does not require my
-# approval for changes to this package. -- mandree@FreeBSD.org
 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
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 WRKSRC=		${WRKDIR}/EasyRSA-${DISTVERSION}
 
 OPTIONS_DEFINE=		DOCS EXAMPLES
 
 PORTDATA=	x509-types/
 _pd_files=	ChangeLog COPYING.md README.md README.quickstart.md mktemp.txt
 _pd_dirs=	doc/
 PORTDOCS=	${_pd_files} ${_pd_dirs}
 
 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/files/patch-easyrsa b/security/easy-rsa/files/patch-easyrsa
index c6582845c35b..f839ca4b6015 100644
--- a/security/easy-rsa/files/patch-easyrsa
+++ b/security/easy-rsa/files/patch-easyrsa
@@ -1,14 +1,32 @@
 Isolate date -j -f ... + ... from locale.
 Filed upstream as Issue #591 <https://github.com/OpenVPN/easy-rsa/issues/591>
 
 --- easyrsa.orig	2022-05-19 01:53:50 UTC
 +++ easyrsa
-@@ -3829,6 +3829,8 @@ VERSION_TEXT
+@@ -2037,7 +2037,7 @@ renewable() {
+ 	verify_ca_init
+ 
+ 	in_dir="$EASYRSA_PKI"
+-	MATCH=$(echo "$*" | sed -re 's/\s+/|/g')
++	MATCH=$(echo "$*" | sed -re 's/[[:space:]]+/|/g')
+ 	DATE=$(date --date \
+                "+${EASYRSA_CERT_RENEW} days" \
+                +"%y%m%d%H%M%S")
+@@ -2445,7 +2445,7 @@ display_san() {
+ 
+ 	if echo "$EASYRSA_EXTRA_EXTS" | grep -q subjectAltName; then
+ 		print "$(echo "$EASYRSA_EXTRA_EXTS" | grep subjectAltName |
+-			sed 's/^\s*subjectAltName\s*=\s*//')"
++			sed 's/^[[:space:]]*subjectAltName[[:space:]]*=[[:space:]]*//')"
+ 	else
+ 		san="$(
+ 		x509v3san="X509v3 Subject Alternative Name:"
+@@ -3828,6 +3828,8 @@ VERSION_TEXT
+ 
  NL='
  '
- 
-+LC_TIME=C ; export LC_TIME ; unset LC_ALL
 +
++LC_TIME=C ; export LC_TIME ; unset LC_ALL
+ 
  # Be secure with a restrictive umask
  [ -z "$EASYRSA_NO_UMASK" ] && umask "${EASYRSA_UMASK:-077}"
-