diff --git a/security/pam_pkcs11/Makefile b/security/pam_pkcs11/Makefile
index 31d7a9ca0081..272da541f15c 100644
--- a/security/pam_pkcs11/Makefile
+++ b/security/pam_pkcs11/Makefile
@@ -1,99 +1,99 @@
 # Created by: Ka Ho Ng <khng300@gmail.com>
 
 PORTNAME=	pam_pkcs11
-PORTVERSION=	0.6.11
+PORTVERSION=	0.6.12
 DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	security
 
-MAINTAINER=	khng300@gmail.com
+MAINTAINER=	khng@FreeBSD.org
 COMMENT=	PAM module using crypto tokens for auth
 
 LICENSE=	LGPL21
 
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		autoreconf gmake libtool pkgconfig shebangfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenSC
 
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--with-confdir=${ETCDIR}
 CONFIGURE_ENV=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto"
 
 SHEBANG_FILES=	tools/pkcs11_make_hash_link
 
-SUB_FILES=	pkg-message
-
 OPTIONS_DEFINE=		CURL DEBUG DOCS LDAP NLS NSS PCSC SSL
 OPTIONS_DEFAULT=	PCSC SSL
 OPTIONS_SUB=		yes
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_WITH=	curl
 
 LDAP_USE=		OPENLDAP=yes
 LDAP_CONFIGURE_WITH=	ldap
 
 # Users can only choose either NSS or SSL
 NSS_DESC=		Enable Mozilla's NSS support
 NSS_CONFIGURE_WITH=	nss
 NSS_LIB_DEPENDS=	libnss3.so:security/nss \
 			libnspr4.so:devel/nspr
 NSS_PREVENTS=		SSL
 
 PCSC_DESC=		Enable PC/SC support
 PCSC_LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
 PCSC_CONFIGURE_WITH=	pcsclite
 
 SSL_USES=		ssl
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=	gettext
 
 DOCS_CONFIGURE_ENABLE=	doc
 
 PORTDOCS=	*
 
 PAM_PKCS11_EXAMPLEDOCS=	\
 	etc/card_eventmgr.conf.example		\
 	etc/digest_mapping.example		\
 	etc/mail_mapping.example		\
 	etc/pam.d_login.example.in		\
 	etc/pam_pkcs11.conf.example.in		\
 	etc/pkcs11_eventmgr.conf.example	\
 	etc/subject_mapping.example
 
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MDEBUG}
 INSTALL_TARGET=		install-strip
 .else
 CONFIGURE_ARGS+=	--with-debug=yes
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 BUILD_DEPENDS+=	xsltproc:textproc/libxslt \
 		${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl
 CONFIGURE_ENV+=	XSLTPROC="${LOCALBASE}/bin/xsltproc"
 CONFIGURE_ARGS+=--with-xsl-stylesheetsdir=${LOCALBASE}/share/xsl/docbook
 .else
 CONFIGURE_ENV+=	XSLTPROC="${FALSE}"
 CONFIGURE_ARGS+=--without-xsl-stylesheetsdir
 .endif
 
 post-patch:
 .for f in ${PAM_PKCS11_EXAMPLEDOCS}
 	@${REINPLACE_CMD} -e 's|/etc/${PORTNAME}|${ETCDIR}|g'		\
 		-e 's|file:///etc/${PORTNAME}/|file://${ETCDIR}/|g'	\
 		-e 's|/usr/lib|${PREFIX}/lib|g'				\
 		-e 's|/usr/share|${PREFIX}/share|g'			\
 		${WRKSRC}/${f}
 .endfor
+	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g'	\
+		${WRKSRC}/doc/pam_pkcs11.8.in
 
 pre-configure:
 	@(cd ${WRKSRC} && ./bootstrap)
 
 .include <bsd.port.mk>
diff --git a/security/pam_pkcs11/distinfo b/security/pam_pkcs11/distinfo
index e39f0420fb60..fc4f35ffdb81 100644
--- a/security/pam_pkcs11/distinfo
+++ b/security/pam_pkcs11/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1600161659
-SHA256 (OpenSC-pam_pkcs11-pam_pkcs11-0.6.11_GH0.tar.gz) = 6674ec488757ce6dc6768ebdb215d3b92897702517f182decfb222d03a98461b
-SIZE (OpenSC-pam_pkcs11-pam_pkcs11-0.6.11_GH0.tar.gz) = 271552
+TIMESTAMP = 1625511158
+SHA256 (OpenSC-pam_pkcs11-pam_pkcs11-0.6.12_GH0.tar.gz) = c29cfd021fd3793263f1784b039f166f0e751996bada656a0f9470005eb0c093
+SIZE (OpenSC-pam_pkcs11-pam_pkcs11-0.6.12_GH0.tar.gz) = 272762
diff --git a/security/pam_pkcs11/files/pkg-message.in b/security/pam_pkcs11/files/pkg-message.in
deleted file mode 100644
index 2040fc58fb44..000000000000
--- a/security/pam_pkcs11/files/pkg-message.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-Note: base configuration directory is %%ETCDIR%% instead of
-/etc/pam_pkcs11 in PAM-PKCS11 User Manual.
-EOM
-}
-]