diff --git a/security/easy-rsa/Makefile b/security/easy-rsa/Makefile
index 22057c7dd02..1d4295d9267 100644
--- a/security/easy-rsa/Makefile
+++ b/security/easy-rsa/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2019/07/12 20:49:01 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2020/04/16 06:26:00 bket Exp $
 
 COMMENT =	small RSA key management package
 
-V =		3.0.6
+V =		3.0.7
 PKGNAME =	easy-rsa-$V
-DISTNAME =	EasyRSA-unix-v$V
+DISTNAME =	EasyRSA-$V
 EXTRACT_SUFX =	.tgz
 CATEGORIES =	security
 
@@ -18,8 +18,6 @@ MASTER_SITES =	https://github.com/OpenVPN/easy-rsa/releases/download/v$V/
 NO_BUILD =	Yes
 NO_TEST =	Yes
 
-WRKDIST =	${WRKDIR}/${DISTNAME:S/unix-//}
-
 I =		${PREFIX}/share/easy-rsa
 
 do-install:
diff --git a/security/easy-rsa/distinfo b/security/easy-rsa/distinfo
index 85b374f752a..d83a2369fb0 100644
--- a/security/easy-rsa/distinfo
+++ b/security/easy-rsa/distinfo
@@ -1,2 +1,2 @@
-SHA256 (EasyRSA-unix-v3.0.6.tgz) = yymu0tJ4JOWduq1UfxHcqzgKU8n+BWgSSegEr0NvE5Y=
-SIZE (EasyRSA-unix-v3.0.6.tgz) = 40840
+SHA256 (EasyRSA-3.0.7.tgz) = FX0ujBFcOtBwwbJkGkyRkeBqMqjlCXGEenGCUe61EKg=
+SIZE (EasyRSA-3.0.7.tgz) = 48215
diff --git a/security/easy-rsa/pkg/PLIST b/security/easy-rsa/pkg/PLIST
index 8741e6138e8..e23775a6590 100644
--- a/security/easy-rsa/pkg/PLIST
+++ b/security/easy-rsa/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2019/02/15 20:50:40 bket Exp $
+@comment $OpenBSD: PLIST,v 1.7 2020/04/16 06:26:00 bket Exp $
 @extraunexec rm -rf %D/share/easy-rsa/pki
 share/easy-rsa/
 share/easy-rsa/COPYING.md
@@ -22,5 +22,7 @@ share/easy-rsa/x509-types/COMMON
 share/easy-rsa/x509-types/ca
 share/easy-rsa/x509-types/client
 share/easy-rsa/x509-types/code-signing
+share/easy-rsa/x509-types/email
+share/easy-rsa/x509-types/kdc
 share/easy-rsa/x509-types/server
 share/easy-rsa/x509-types/serverClient