diff --git a/security/opencryptoki/Makefile b/security/opencryptoki/Makefile
index 420b194a4293..2a60ea9aa77e 100644
--- a/security/opencryptoki/Makefile
+++ b/security/opencryptoki/Makefile
@@ -1,65 +1,67 @@
 PORTNAME=	opencryptoki
 PORTVERSION=	3.19.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	security
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Open PKCS\#11 implementation library
 WWW=		https://sourceforge.net/projects/opencryptoki/
 
 LICENSE=	CPL
 LICENSE_NAME=	Common Public License
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libtspi.so:security/trousers \
 		libepoll-shim.so:devel/libepoll-shim
 
 USES=		alias autoreconf bison gmake ldap libtool localbase ssl tar:tgz
 USE_LDCONFIG=	${PREFIX}/lib/opencryptoki
 USE_GITHUB=	yes
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
 CONFIGURE_ARGS=	--enable-swtok \
 		--enable-tpmtok \
 		--enable-icsftok \
 		--disable-crtok \
 		--disable-aeptok \
 		--disable-ccatok \
 		--disable-bcomtok \
 		--disable-pkcscca_migrate \
 		--with-lockdir=/var/run/opencryptoki \
 		--with-logdir=/var/log/opencryptoki \
 		--localstatedir=/var \
 		--with-openssl=${OPENSSLBASE} \
 		--with-pkcs11user=${USERS} \
 		--with-pkcs11group=${GROUPS} \
 		ac_cv_path_CHGRP=true
 INSTALL_TARGET=	install-strip
 USE_RC_SUBR=	pkcsslotd
 SUB_FILES=	pkg-message
 SUB_LIST=	USERS="${USERS}" GROUPS="${GROUPS}"
 PLIST_SUB=	USERS="${USERS}" GROUPS="${GROUPS}"
 USERS=		_pkcs11
 GROUPS=		_pkcs11
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
 post-patch:
 	cd ${WRKSRC} && \
 	    ${REINPLACE_CMD} 's,%%DLLDIR%%,${PREFIX}/lib/opencryptoki/stdll,' \
 	    usr/sbin/pkcsslotd/opencryptoki.conf
 
 post-install:
 	${MV} ${STAGEDIR}${DOCSDIR}/strength-example.conf \
 	    ${STAGEDIR}${ETCDIR}/strength.conf.sample
 	${MV} ${STAGEDIR}${DOCSDIR}/policy-example.conf \
 	    ${STAGEDIR}${ETCDIR}/policy.conf.sample
 	${RMDIR} ${STAGEDIR}/var/run/opencryptoki/* \
 	    ${STAGEDIR}/var/run/opencryptoki
 
 .include <bsd.port.post.mk>
diff --git a/security/opencryptoki/pkg-plist b/security/opencryptoki/pkg-plist
index 61144a82bf62..4b8c63cd2e14 100644
--- a/security/opencryptoki/pkg-plist
+++ b/security/opencryptoki/pkg-plist
@@ -1,54 +1,54 @@
 @sample etc/opencryptoki/opencryptoki.conf.sample
 @sample(0,%%GROUPS%%,640) etc/opencryptoki/p11sak_defined_attrs.conf.sample
 @sample(0,%%GROUPS%%,640) etc/opencryptoki/policy.conf.sample
 @sample(0,%%GROUPS%%,640) etc/opencryptoki/strength.conf.sample
 include/opencryptoki/apiclient.h
 include/opencryptoki/ec_curves.h
 include/opencryptoki/pkcs11.h
 include/opencryptoki/pkcs11types.h
 lib/opencryptoki/libopencryptoki.so
 lib/opencryptoki/libopencryptoki.so.0
 lib/opencryptoki/libopencryptoki.so.0.0.0
 lib/opencryptoki/methods
 lib/opencryptoki/PKCS11_API.so
 lib/opencryptoki/stdll/libpkcs11_icsf.so
 lib/opencryptoki/stdll/libpkcs11_icsf.so.0
 lib/opencryptoki/stdll/libpkcs11_icsf.so.0.0.0
 lib/opencryptoki/stdll/libpkcs11_sw.so
 lib/opencryptoki/stdll/libpkcs11_sw.so.0
 lib/opencryptoki/stdll/libpkcs11_sw.so.0.0.0
 lib/opencryptoki/stdll/libpkcs11_tpm.so
 lib/opencryptoki/stdll/libpkcs11_tpm.so.0
 lib/opencryptoki/stdll/libpkcs11_tpm.so.0.0.0
 lib/opencryptoki/stdll/PKCS11_ICSF.so
 lib/opencryptoki/stdll/PKCS11_SW.so
 lib/opencryptoki/stdll/PKCS11_TPM.so
 lib/pkcs11/libopencryptoki.so
 lib/pkcs11/methods
 lib/pkcs11/PKCS11_API.so
 lib/pkcs11/stdll
 libdata/pkgconfig/opencryptoki.pc
-man/man1/p11sak.1.gz
-man/man1/pkcsconf.1.gz
-man/man1/pkcsicsf.1.gz
-man/man1/pkcsstats.1.gz
-man/man1/pkcstok_migrate.1.gz
-man/man5/opencryptoki.conf.5.gz
-man/man5/p11sak_defined_attrs.conf.5.gz
-man/man5/policy.conf.5.gz
-man/man5/strength.conf.5.gz
-man/man7/opencryptoki.7.gz
-man/man8/pkcsslotd.8.gz
 sbin/p11sak
 sbin/pkcsconf
 sbin/pkcsicsf
 sbin/pkcsslotd
 sbin/pkcsstats
 sbin/pkcstok_migrate
+share/man/man1/p11sak.1.gz
+share/man/man1/pkcsconf.1.gz
+share/man/man1/pkcsicsf.1.gz
+share/man/man1/pkcsstats.1.gz
+share/man/man1/pkcstok_migrate.1.gz
+share/man/man5/opencryptoki.conf.5.gz
+share/man/man5/p11sak_defined_attrs.conf.5.gz
+share/man/man5/policy.conf.5.gz
+share/man/man5/strength.conf.5.gz
+share/man/man7/opencryptoki.7.gz
+share/man/man8/pkcsslotd.8.gz
 @dir(%%USERS%%,%%GROUPS%%,770) /var/lib/opencryptoki
 @dir(%%USERS%%,%%GROUPS%%,770) /var/lib/opencryptoki/icsf
 @dir(%%USERS%%,%%GROUPS%%,770) /var/lib/opencryptoki/swtok
 @dir(%%USERS%%,%%GROUPS%%,770) /var/lib/opencryptoki/swtok/TOK_OBJ
 @dir(%%USERS%%,%%GROUPS%%,770) /var/lib/opencryptoki/tpm
 @dir /var/lib
 @dir /var/log/opencryptoki