diff --git a/security/easy-rsa/Makefile b/security/easy-rsa/Makefile
index b1a0304f579e..7cbe849e9b68 100644
--- a/security/easy-rsa/Makefile
+++ b/security/easy-rsa/Makefile
@@ -1,51 +1,53 @@
 PORTNAME=	easy-rsa
 DISTVERSION=	3.1.0
+PORTREVISION=	1
 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/
+		${LN} -fh ${STAGEDIR}${PREFIX}/bin/easyrsa ${STAGEDIR}${PREFIX}/bin/easy-rsa
 		${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/pkg-message b/security/easy-rsa/pkg-message
new file mode 100644
index 000000000000..64008e57eb92
--- /dev/null
+++ b/security/easy-rsa/pkg-message
@@ -0,0 +1,15 @@
+NOTE: easy-rsa will require you to initialize a pki ONLY UPON FIRST USE.
+The packaging itself no longer does this because that would confuse easy-rsa,
+and easy-rsa expects the vars not to be per-installation, but per-PKI.
+
+ONLY for the very first run for a new PKI, do something such as:
+
+  easyrsa --pki-dir=~/my_new_pki init-pki # DANGEROUS - DESTROYS ~/my_new_pki
+  which will copy vars.example both into ~/my_new_pki
+  and create another copy named ~/my/new_pki/vars for you to edit for this PKI.
+
+  Then, edit ~/my/new_pki/vars to set the defaults.
+
+After upgrades, use other commands, explained by running: easyrsa help.
+to explain options such as --pki-dir (see above), run: easyrsa help options
+
diff --git a/security/easy-rsa/pkg-plist b/security/easy-rsa/pkg-plist
index a98f2b0dcdf6..af2c06e18188 100644
--- a/security/easy-rsa/pkg-plist
+++ b/security/easy-rsa/pkg-plist
@@ -1,4 +1,5 @@
 bin/easyrsa
+bin/easy-rsa
 %%DATADIR%%/easyrsa.real
 @sample %%DATADIR%%/openssl-easyrsa.cnf.example %%DATADIR%%/openssl-easyrsa.cnf
-@sample %%DATADIR%%/vars.example %%DATADIR%%/vars
+%%DATADIR%%/vars.example