diff --git a/security/p11-kit/Makefile b/security/p11-kit/Makefile
index d6764d38ebe4..c9e5f629654f 100644
--- a/security/p11-kit/Makefile
+++ b/security/p11-kit/Makefile
@@ -1,51 +1,54 @@
 # Created by: Roman Bogorodskiy <novel@FreeBSD.org>
 
 PORTNAME=	p11-kit
 DISTVERSION=	0.24.0
 CATEGORIES=	security devel
 MASTER_SITES=	https://github.com/p11-glue/p11-kit/releases/download/${DISTVERSION}/
 
+PATCH_SITES=	https://github.com/p11-glue/${PORTNAME}/commit/
+PATCHFILES+=	9f01a8a45ba9.patch:-p1 # https://github.com/p11-glue/p11-kit/pull/407
+
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Library for loading and enumerating of PKCS\#11 modules
 
 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
 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
 
 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
 
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${MV} ${STAGEDIR}${PREFIX}/etc/pkcs11/pkcs11.conf.example ${STAGEDIR}${EXAMPLESDIR}
 	${RMDIR} ${STAGEDIR}${PREFIX}/etc/pkcs11
 
 .include <bsd.port.mk>
diff --git a/security/p11-kit/distinfo b/security/p11-kit/distinfo
index ca620741fe76..8a3f00adaed0 100644
--- a/security/p11-kit/distinfo
+++ b/security/p11-kit/distinfo
@@ -1,3 +1,5 @@
 TIMESTAMP = 1623028391
 SHA256 (p11-kit-0.24.0.tar.xz) = 81e6140584f635e4e956a1b93a32239acf3811ff5b2d3a5c6094e94e99d2c685
 SIZE (p11-kit-0.24.0.tar.xz) = 834392
+SHA256 (9f01a8a45ba9.patch) = 1542a568331bf39574e72391db250629d1bb08066e9e033c5f6d5d787f616cb9
+SIZE (9f01a8a45ba9.patch) = 1730
diff --git a/security/p11-kit/files/patch-doc_manual_meson.build b/security/p11-kit/files/patch-doc_manual_meson.build
deleted file mode 100644
index 48d5b217852f..000000000000
--- a/security/p11-kit/files/patch-doc_manual_meson.build
+++ /dev/null
@@ -1,13 +0,0 @@
-https://github.com/p11-glue/p11-kit/issues/406
-
---- doc/manual/meson.build.orig	2021-05-25 07:15:23 UTC
-+++ doc/manual/meson.build
-@@ -70,7 +70,7 @@ if get_option('gtk_doc')
-               main_xml: 'p11-kit-docs.xml',
-               namespace: 'p11_kit',
-               src_dir: 'p11-kit',
--              dependencies: libffi_deps + dlopen_deps + xml_deps,
-+              dependencies: libffi_deps + dlopen_deps,
-               scan_args: [
-                 '--ignore-headers=' + ' '.join(ignore_headers),
-                 '--rebuild-types',