diff --git a/security/libpki/Makefile b/security/libpki/Makefile
index 2583811f7040..17e62c596635 100644
--- a/security/libpki/Makefile
+++ b/security/libpki/Makefile
@@ -1,37 +1,61 @@
 PORTNAME=	libpki
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.2
+PORTREVISION=	1
 CATEGORIES=	security
 
 PATCH_SITES=	https://github.com/openca/libpki/commit/
 PATCHFILES=	d7617046e9da97473a140c02582fa571f6359ae3.patch:-p1
 
 MAINTAINER=	bruno@ruomad.net
 COMMENT=	OpenCA PKI library (libpki) and tools
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+NOT_FOR_ARCHS=	arm64
+
 USES=		autoreconf gnome libtool ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	openca
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-dependency-tracking \
-		--disable-dns \
-		--disable-iphone \
-		--disable-ldap \
-		--disable-mysql \
-		--disable-pg
+		--disable-iphone
+
 INSTALL_TARGET=	install-strip
 
+OPTIONS_DEFINE=	DNS LDAP MYSQL PGSQL
+
+DNS_DESC=	"Enable DNS support"
+LDAP_DESC=	"Enable LDAP support"
+MYSQL_DESC=	"Enable MySQL support"
+PGSQL_DESC=	"Enable PostgreSQL support"
+
+DNS_CONFIGURE_ENABLE=	dns
+LDAP_LIB_DEPENDS=	liblber.so:net/openldap24-client \
+			libldap_r.so:net/openldap24-client
+LDAP_CONFIGURE_ENABLE=	ldap
+LDAP_LDFLAGS+=		-llber
+MYSQL_USES=		mysql
+MYSQL_CONFIGURE_ENABLE=	mysql
+PGSQL_USES=		pgsql
+PGSQL_CONFIGURE_ENABLE=	pg
+
 post-stage:
-	${MV} ${STAGEDIR}${PREFIX}/etc/pki.conf ${STAGEDIR}${PREFIX}/etc/pki.conf.sample; \
-	for f in $$(find ${STAGEDIR}${PREFIX}/etc/libpki -type f); do \
-		${MV} $$f $$f.sample; \
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/libpki/etc; \
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/libpki/etc/libpki; \
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/libpki/etc/libpki/hsm.d; \
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/libpki/etc/libpki/profile.d; \
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/libpki/etc/libpki/store.d; \
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/libpki/etc/libpki/token.d; \
+	${MV} ${STAGEDIR}${PREFIX}/etc/pki.conf ${STAGEDIR}${PREFIX}/share/libpki/etc/pki.conf.sample; \
+	cd ${STAGEDIR}${PREFIX}/etc/libpki; \
+	for f in $$(find * -type f); do \
+		${MV} ${STAGEDIR}${PREFIX}/etc/libpki/$$f ${STAGEDIR}${PREFIX}/share/libpki/etc/libpki/$$f.sample; \
 	done; \
 	${RM} -rf ${STAGEDIR}${PREFIX}/include/internal
 
 .include <bsd.port.mk>
diff --git a/security/libpki/pkg-message b/security/libpki/pkg-message
new file mode 100644
index 000000000000..78dcb8f577d4
--- /dev/null
+++ b/security/libpki/pkg-message
@@ -0,0 +1,17 @@
+[
+{ type: install
+  message: <<EOM
+Sample Configuration files have been installed in $PREFIX/share/libpki/etc, in a
+hierachy that mimics the one created in $PREFIX/etc.
+They may be used as templates to be copied into the corresponding subdirectory
+under $PREFIX/etc and customized according to user context.
+EOM
+}
+{
+  type: remove
+  message: <<EOM
+User-installed configuration files under $PREFIX/etc/libpki have been preserved and
+must be removed manually if needed, as well as this directory. 
+EOM
+}
+]
diff --git a/security/libpki/pkg-plist b/security/libpki/pkg-plist
index 5595d20e913c..2db500532b58 100644
--- a/security/libpki/pkg-plist
+++ b/security/libpki/pkg-plist
@@ -1,178 +1,182 @@
 bin/libpki-config
 bin/pki-cert
 bin/pki-crl
 bin/pki-derenc
 bin/pki-query
 bin/pki-request
 bin/pki-siginfo
 bin/pki-tool
 bin/pki-xpair
 bin/url-tool
-@sample %%ETCDIR%%/hsm.d/eracom-sdk.xml.sample
-@sample %%ETCDIR%%/hsm.d/etoken-engine.xml.sample
-@sample %%ETCDIR%%/hsm.d/etoken-pkcs11.xml.sample
-@sample %%ETCDIR%%/hsm.d/etoken.xml.sample
-@sample %%ETCDIR%%/hsm.d/opencryptoki.xml.sample
-@sample %%ETCDIR%%/hsm.d/tpm.xml.sample
-@sample %%ETCDIR%%/objectIdentifiers.xml.sample
-@sample %%ETCDIR%%/profile.d/crl.xml.sample
-@sample %%ETCDIR%%/profile.d/server.xml.sample
-@sample %%ETCDIR%%/profile.d/test.xml.sample
-@sample %%ETCDIR%%/profile.d/user.xml.sample
-@sample %%ETCDIR%%/store.d/empty.xml.sample
-@sample %%ETCDIR%%/token.d/default.xml.sample
-@sample %%ETCDIR%%/token.d/eracom.xml.sample
-@sample %%ETCDIR%%/token.d/etoken-engine.xml.sample
-@sample %%ETCDIR%%/token.d/etoken.xml.sample
-@sample %%ETCDIR%%/token.d/opencryptoki.xml.sample
-@sample %%ETCDIR%%/token.d/software.xml.sample
-@sample %%ETCDIR%%/token.d/test.xml.sample
-@sample %%ETCDIR%%/token.d/tpm.xml.sample
-@sample etc/pki.conf.sample
 include/libpki/banners.h
 include/libpki/cmc.h
 include/libpki/cmc/cmc_cert_req.h
 include/libpki/compat.h
 include/libpki/config.h
 include/libpki/crypto.h
 include/libpki/datatypes.h
 include/libpki/drivers/engine/data_st.h
 include/libpki/drivers/engine/engine_hsm.h
 include/libpki/drivers/engine/engine_hsm_obj.h
 include/libpki/drivers/engine/engine_hsm_pkey.h
 include/libpki/drivers/engine/engine_st.h
 include/libpki/drivers/hsm_keypair.h
 include/libpki/drivers/hsm_main.h
 include/libpki/drivers/hsm_slot.h
 include/libpki/drivers/kmf/data_st.h
 include/libpki/drivers/kmf/kmf_hsm.h
 include/libpki/drivers/kmf/kmf_hsm_engine.h
 include/libpki/drivers/kmf/kmf_hsm_pkey.h
 include/libpki/drivers/kmf/kmf_hsm_sign.h
 include/libpki/drivers/kmf/pki_kmflib.h
 include/libpki/drivers/openssl/data_st.h
 include/libpki/drivers/openssl/openssl_hsm.h
 include/libpki/drivers/openssl/openssl_hsm_cb.h
 include/libpki/drivers/openssl/openssl_hsm_obj.h
 include/libpki/drivers/openssl/openssl_hsm_pkey.h
 include/libpki/drivers/pkcs11/pkcs11_hsm.h
 include/libpki/drivers/pkcs11/pkcs11_hsm_obj.h
 include/libpki/drivers/pkcs11/pkcs11_hsm_pkey.h
 include/libpki/drivers/pkcs11/pkcs11_utils.h
 include/libpki/drivers/pkcs11/rsa/cryptoki.h
 include/libpki/drivers/pkcs11/rsa/pkcs11.h
 include/libpki/drivers/pkcs11/rsa/pkcs11_func.h
 include/libpki/drivers/pkcs11/rsa/pkcs11f.h
 include/libpki/drivers/pkcs11/rsa/pkcs11t.h
 include/libpki/errors-new.h
 include/libpki/errors.h
 include/libpki/est/est.h
 include/libpki/est/pki_x509_est_asn1.h
 include/libpki/est/pki_x509_est_attrs.h
 include/libpki/est/pki_x509_est_data.h
 include/libpki/est/pki_x509_est_msg.h
 include/libpki/extensions.h
 include/libpki/hsm_st.h
 include/libpki/io/pki_keypair_io.h
 include/libpki/io/pki_msg_req_io.h
 include/libpki/io/pki_msg_resp_io.h
 include/libpki/io/pki_ocsp_req_io.h
 include/libpki/io/pki_ocsp_resp_io.h
 include/libpki/io/pki_x509_cert_io.h
 include/libpki/io/pki_x509_cms_io.h
 include/libpki/io/pki_x509_crl_io.h
 include/libpki/io/pki_x509_io.h
 include/libpki/io/pki_x509_p12_io.h
 include/libpki/io/pki_x509_pkcs7_io.h
 include/libpki/io/pki_x509_req_io.h
 include/libpki/io/pki_x509_xpair_io.h
 include/libpki/libpkiv.h
 include/libpki/net/dns.h
 include/libpki/net/http_s.h
 include/libpki/net/ldap.h
 include/libpki/net/pkcs11.h
 include/libpki/net/pki_mysql.h
 include/libpki/net/pki_pg.h
 include/libpki/net/pki_socket.h
 include/libpki/net/sock.h
 include/libpki/net/ssl.h
 include/libpki/net/url.h
 include/libpki/openssl/data_st.h
 include/libpki/openssl/pthread_init.h
 include/libpki/os.h
 include/libpki/pki.h
 include/libpki/pki_algor.h
 include/libpki/pki_conf.h
 include/libpki/pki_config.h
 include/libpki/pki_cred.h
 include/libpki/pki_digest.h
 include/libpki/pki_err.h
 include/libpki/pki_hmac.h
 include/libpki/pki_id.h
 include/libpki/pki_id_info.h
 include/libpki/pki_init.h
 include/libpki/pki_integer.h
 include/libpki/pki_io.h
 include/libpki/pki_keypair.h
 include/libpki/pki_keyparams.h
 include/libpki/pki_log.h
 include/libpki/pki_mem.h
 include/libpki/pki_msg.h
 include/libpki/pki_msg_req.h
 include/libpki/pki_msg_resp.h
 include/libpki/pki_ocsp_req.h
 include/libpki/pki_ocsp_resp.h
 include/libpki/pki_oid.h
 include/libpki/pki_string.h
 include/libpki/pki_threads.h
 include/libpki/pki_threads_vars.h
 include/libpki/pki_time.h
 include/libpki/pki_x509.h
 include/libpki/pki_x509_attribute.h
 include/libpki/pki_x509_cert.h
 include/libpki/pki_x509_cert_mem.h
 include/libpki/pki_x509_cms.h
 include/libpki/pki_x509_crl.h
 include/libpki/pki_x509_data_st.h
 include/libpki/pki_x509_extension.h
 include/libpki/pki_x509_mem.h
 include/libpki/pki_x509_mime.h
 include/libpki/pki_x509_name.h
 include/libpki/pki_x509_p12.h
 include/libpki/pki_x509_pkcs7.h
 include/libpki/pki_x509_profile.h
 include/libpki/pki_x509_req.h
 include/libpki/pki_x509_signature.h
 include/libpki/pki_x509_xpair.h
 include/libpki/pki_x509_xpair_asn1.h
 include/libpki/profile.h
 include/libpki/prqp/http_client.h
 include/libpki/prqp/prqp.h
 include/libpki/prqp/prqp_asn1.h
 include/libpki/prqp/prqp_bio.h
 include/libpki/prqp/prqp_lib.h
 include/libpki/prqp/prqp_req_io.h
 include/libpki/prqp/prqp_resp_io.h
 include/libpki/prqp/prqp_srv.h
 include/libpki/prqp/prqp_stack.h
 include/libpki/scep/pki_x509_scep_asn1.h
 include/libpki/scep/pki_x509_scep_attrs.h
 include/libpki/scep/pki_x509_scep_data.h
 include/libpki/scep/pki_x509_scep_msg.h
 include/libpki/scep/scep.h
 include/libpki/stack.h
 include/libpki/support.h
 include/libpki/token.h
 include/libpki/token_data.h
 include/libpki/token_id.h
 include/libpki/token_st.h
 lib/libpki.a
 lib/libpki.so
 lib/libpki.so.92
 lib/libpki.so.92.92.4
 %%DATADIR%%/README.data_structures
 %%DATADIR%%/README.functions
 %%DATADIR%%/doxygen-man.conf
 %%DATADIR%%/doxygen-pdf.conf
 %%DATADIR%%/doxygen.conf
 %%DATADIR%%/pkginfo
+%%DATADIR%%/etc/pki.conf.sample
+%%DATADIR%%/etc/libpki/hsm.d/eracom-sdk.xml.sample
+%%DATADIR%%/etc/libpki/hsm.d/etoken-engine.xml.sample
+%%DATADIR%%/etc/libpki/hsm.d/etoken-pkcs11.xml.sample
+%%DATADIR%%/etc/libpki/hsm.d/etoken.xml.sample
+%%DATADIR%%/etc/libpki/hsm.d/opencryptoki.xml.sample
+%%DATADIR%%/etc/libpki/hsm.d/tpm.xml.sample
+%%DATADIR%%/etc/libpki/objectIdentifiers.xml.sample
+%%DATADIR%%/etc/libpki/profile.d/crl.xml.sample
+%%DATADIR%%/etc/libpki/profile.d/server.xml.sample
+%%DATADIR%%/etc/libpki/profile.d/test.xml.sample
+%%DATADIR%%/etc/libpki/profile.d/user.xml.sample
+%%DATADIR%%/etc/libpki/store.d/empty.xml.sample
+%%DATADIR%%/etc/libpki/token.d/default.xml.sample
+%%DATADIR%%/etc/libpki/token.d/eracom.xml.sample
+%%DATADIR%%/etc/libpki/token.d/etoken-engine.xml.sample
+%%DATADIR%%/etc/libpki/token.d/etoken.xml.sample
+%%DATADIR%%/etc/libpki/token.d/opencryptoki.xml.sample
+%%DATADIR%%/etc/libpki/token.d/software.xml.sample
+%%DATADIR%%/etc/libpki/token.d/test.xml.sample
+%%DATADIR%%/etc/libpki/token.d/tpm.xml.sample
+@dir etc/libpki/hsm.d
+@dir etc/libpki/profile.d
+@dir etc/libpki/store.d
+@dir etc/libpki/token.d