diff --git a/security/p11-kit/Makefile b/security/p11-kit/Makefile
index 268a528714b3..3c0f87d563c1 100644
--- a/security/p11-kit/Makefile
+++ b/security/p11-kit/Makefile
@@ -1,51 +1,58 @@
 PORTNAME=	p11-kit
 DISTVERSION=	0.24.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security devel
 MASTER_SITES=	https://github.com/p11-glue/p11-kit/releases/download/${DISTVERSION}/
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Library for loading and enumerating of PKCS\#11 modules
 WWW=		https://p11-glue.freedesktop.org/p11-kit.html
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss \
-		bash-completion>=0:shells/bash-completion
-RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
+BUILD_DEPENDS=	bash-completion>=0:shells/bash-completion
 LIB_DEPENDS=	libffi.so:devel/libffi \
 		libtasn1.so:security/libtasn1
 
 USES=		cpe localbase meson pkgconfig tar:xz
 USE_LDCONFIG=	yes
 
 CPE_VENDOR=	p11-kit_project
 
 MESON_ARGS=	-Dbash_completion=enabled \
 		-Dlibffi=enabled \
 		-Dnls=false \
 		-Dtrust_module=enabled \
-		-Dtrust_paths=${LOCALBASE}/share/certs/ca-root-nss.crt
+		-Dtrust_paths=${DATADIR}/certs
 
 OPTIONS_DEFINE=		DOCS MANPAGES TEST
 OPTIONS_SUB=		yes
 MANPAGES_IMPLIES=	DOCS
 OPTIONS_DEFAULT=	MANPAGES
 
 DOCS_BUILD_DEPENDS=	gtkdoc-scan:textproc/gtk-doc
 DOCS_USES=		gnome
 DOCS_USE=		GNOME=glib20
 DOCS_MESON_TRUE=	gtk_doc
 
 MANPAGES_BUILD_DEPENDS=	xsltproc:textproc/libxslt
 MANPAGES_MESON_TRUE=	man
 
 TEST_MESON_TRUE=	test
 
+.include <bsd.port.options.mk>
+
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${MV} ${STAGEDIR}${PREFIX}/etc/pkcs11/pkcs11.conf.example ${STAGEDIR}${EXAMPLESDIR}
 	${RMDIR} ${STAGEDIR}${PREFIX}/etc/pkcs11
+	${MKDIR} ${STAGEDIR}${DATADIR}/certs
+	${LN} -s /usr/share/certs/trusted ${STAGEDIR}${DATADIR}/certs/anchors
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1400024
+	${LN} -s /usr/share/certs/blacklisted ${STAGEDIR}${DATADIR}/certs/blocklist
+.else
+	${LN} -s /usr/share/certs/untrusted ${STAGEDIR}${DATADIR}/certs/blocklist
+.endif
 
 .include <bsd.port.mk>
diff --git a/security/p11-kit/pkg-plist b/security/p11-kit/pkg-plist
index 7341c822cc7f..dac887134044 100644
--- a/security/p11-kit/pkg-plist
+++ b/security/p11-kit/pkg-plist
@@ -1,65 +1,67 @@
 bin/p11-kit
 bin/trust
 include/p11-kit-1/p11-kit/deprecated.h
 include/p11-kit-1/p11-kit/iter.h
 include/p11-kit-1/p11-kit/p11-kit.h
 include/p11-kit-1/p11-kit/pin.h
 include/p11-kit-1/p11-kit/pkcs11.h
 include/p11-kit-1/p11-kit/pkcs11x.h
 include/p11-kit-1/p11-kit/remote.h
 include/p11-kit-1/p11-kit/uri.h
 lib/libp11-kit.so
 lib/libp11-kit.so.0
 lib/libp11-kit.so.0.3.0
 lib/p11-kit-proxy.so
 lib/pkcs11/p11-kit-client.so
 lib/pkcs11/p11-kit-trust.so
 libdata/pkgconfig/p11-kit-1.pc
 libexec/p11-kit/p11-kit-remote
 libexec/p11-kit/p11-kit-server
 libexec/p11-kit/trust-extract-compat
 %%MANPAGES%%man/man1/trust.1.gz
 %%MANPAGES%%man/man5/pkcs11.conf.5.gz
 %%MANPAGES%%man/man8/p11-kit.8.gz
 share/bash-completion/completions/p11-kit
 share/bash-completion/completions/trust
 %%DOCS%%share/gtk-doc/html/p11-kit/config-example.html
 %%DOCS%%share/gtk-doc/html/p11-kit/config-files.html
 %%DOCS%%share/gtk-doc/html/p11-kit/config.html
 %%DOCS%%share/gtk-doc/html/p11-kit/devel-building-style.html
 %%DOCS%%share/gtk-doc/html/p11-kit/devel-building.html
 %%DOCS%%share/gtk-doc/html/p11-kit/devel-commands.html
 %%DOCS%%share/gtk-doc/html/p11-kit/devel-debugging.html
 %%DOCS%%share/gtk-doc/html/p11-kit/devel-paths.html
 %%DOCS%%share/gtk-doc/html/p11-kit/devel-testing.html
 %%DOCS%%share/gtk-doc/html/p11-kit/devel.html
 %%DOCS%%share/gtk-doc/html/p11-kit/home.png
 %%DOCS%%share/gtk-doc/html/p11-kit/index.html
 %%DOCS%%share/gtk-doc/html/p11-kit/left-insensitive.png
 %%DOCS%%share/gtk-doc/html/p11-kit/left.png
 %%DOCS%%share/gtk-doc/html/p11-kit/p11-kit-Deprecated.html
 %%DOCS%%share/gtk-doc/html/p11-kit/p11-kit-Future.html
 %%DOCS%%share/gtk-doc/html/p11-kit/p11-kit-Modules.html
 %%DOCS%%share/gtk-doc/html/p11-kit/p11-kit-PIN-Callbacks.html
 %%DOCS%%share/gtk-doc/html/p11-kit/p11-kit-URIs.html
 %%DOCS%%share/gtk-doc/html/p11-kit/p11-kit-Utilities.html
 %%DOCS%%share/gtk-doc/html/p11-kit/p11-kit.devhelp2
 %%DOCS%%share/gtk-doc/html/p11-kit/p11-kit.html
 %%DOCS%%share/gtk-doc/html/p11-kit/pkcs11-conf.html
 %%DOCS%%share/gtk-doc/html/p11-kit/reference.html
 %%DOCS%%share/gtk-doc/html/p11-kit/remoting.html
 %%DOCS%%share/gtk-doc/html/p11-kit/right-insensitive.png
 %%DOCS%%share/gtk-doc/html/p11-kit/right.png
 %%DOCS%%share/gtk-doc/html/p11-kit/sharing-managed.html
 %%DOCS%%share/gtk-doc/html/p11-kit/sharing.html
 %%DOCS%%share/gtk-doc/html/p11-kit/style.css
 %%DOCS%%share/gtk-doc/html/p11-kit/tools.html
 %%DOCS%%share/gtk-doc/html/p11-kit/trust-disable.html
 %%DOCS%%share/gtk-doc/html/p11-kit/trust-glib-networking.html
 %%DOCS%%share/gtk-doc/html/p11-kit/trust-module.html
 %%DOCS%%share/gtk-doc/html/p11-kit/trust-nss.html
 %%DOCS%%share/gtk-doc/html/p11-kit/trust.html
 %%DOCS%%share/gtk-doc/html/p11-kit/up-insensitive.png
 %%DOCS%%share/gtk-doc/html/p11-kit/up.png
+%%DATADIR%%/certs/anchors
+%%DATADIR%%/certs/blocklist
 %%DATADIR%%/modules/p11-kit-trust.module
 %%EXAMPLESDIR%%/pkcs11.conf.example