diff --git a/security/easy-rsa/Makefile b/security/easy-rsa/Makefile
index a30fee2ede19..b1a0304f579e 100644
--- a/security/easy-rsa/Makefile
+++ b/security/easy-rsa/Makefile
@@ -1,52 +1,51 @@
 PORTNAME=	easy-rsa
-DISTVERSION=	3.0.8
-PORTREVISION=	1
+DISTVERSION=	3.1.0
 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
 
 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}
 
 SUB_FILES=	easyrsa
 
 do-install:
 		${MKDIR} ${STAGEDIR}${PREFIX}/bin
 		${MKDIR} ${STAGEDIR}${DATADIR}/x509-types/
 		${INSTALL_SCRIPT} ${WRKDIR}/easyrsa ${STAGEDIR}${PREFIX}/bin/
 		${INSTALL_SCRIPT} ${WRKSRC}/easyrsa ${STAGEDIR}${DATADIR}/easyrsa.real
 		${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 310c316c2449..7d8559944507 100644
--- a/security/easy-rsa/distinfo
+++ b/security/easy-rsa/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1600501362
-SHA256 (EasyRSA-3.0.8.tgz) = cae114c212a5be4d89f2253d36c70ab94f68d295f24e8b6711c2cab0fabf7e18
-SIZE (EasyRSA-3.0.8.tgz) = 48907
+TIMESTAMP = 1653138476
+SHA256 (EasyRSA-3.1.0.tgz) = 01b07ecb58dc003e47d4e74f9fc4da35ec6842e96cd003d66ed72a43df983659
+SIZE (EasyRSA-3.1.0.tgz) = 61255
diff --git a/security/easy-rsa/files/patch-easyrsa b/security/easy-rsa/files/patch-easyrsa
deleted file mode 100644
index 4278fe9e171e..000000000000
--- a/security/easy-rsa/files/patch-easyrsa
+++ /dev/null
@@ -1,11 +0,0 @@
---- easyrsa.orig	2020-09-09 20:59:45 UTC
-+++ easyrsa
-@@ -1546,7 +1546,7 @@ default_server_san() {
- 		easyrsa_openssl req -in "$path" -noout -subject -nameopt sep_multiline |
- 		awk -F'=' '/^  *CN=/{print $2}'
- 		)
--	echo "$cn" | grep -E -q '^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$'
-+	echo "$cn" | grep -E -q '^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$'
- 	#shellcheck disable=SC2181
- 	if [ $? -eq 0 ]; then
- 		print "subjectAltName = IP:$cn"