diff --git a/security/p11-kit/Makefile b/security/p11-kit/Makefile
index 57a60e4c67b4..fb8317efa851 100644
--- a/security/p11-kit/Makefile
+++ b/security/p11-kit/Makefile
@@ -2,13 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	p11-kit
-PORTVERSION=	0.23.21
+DISTVERSION=	0.23.22
 CATEGORIES=	security devel
-MASTER_SITES=	https://github.com/p11-glue/p11-kit/releases/download/${PORTVERSION}/
+MASTER_SITES=	https://github.com/p11-glue/p11-kit/releases/download/${DISTVERSION}/
 
-# Partially backport https://github.com/p11-glue/p11-kit/pull/315
 PATCH_SITES=	https://github.com/p11-glue/p11-kit/commit/
-PATCHFILES=	1a21df391691d9a9c7b5ebc77022385f7feb266b.patch:-p1
+PATCHFILES=	507c394cfcf4edffc5e4450c5d737e545c26b857.patch:-p1
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Library for loading and enumerating of PKCS\#11 modules
@@ -47,10 +46,6 @@ MANPAGES_MESON_TRUE=	man
 
 TEST_MESON_TRUE=	test
 
-# Partially backport https://github.com/p11-glue/p11-kit/pull/315
-pre-configure:
-	${MV} ${WRKSRC}/trust/trust-extract-compat.in ${WRKSRC}/trust/trust-extract-compat
-
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${MV} ${STAGEDIR}${PREFIX}/etc/pkcs11/pkcs11.conf.example ${STAGEDIR}${EXAMPLESDIR}
diff --git a/security/p11-kit/distinfo b/security/p11-kit/distinfo
index 1b82fa0468a9..d3e8f6620c2a 100644
--- a/security/p11-kit/distinfo
+++ b/security/p11-kit/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1598049189
-SHA256 (p11-kit-0.23.21.tar.xz) = f1baa493f05ca0d867f06bcb54cbb5cdb28c756db07207b6e18de18a87b10627
-SIZE (p11-kit-0.23.21.tar.xz) = 827064
-SHA256 (1a21df391691d9a9c7b5ebc77022385f7feb266b.patch) = b99d6de5a0e2aebf2338476ff2dd1cb30061e91ab9c2064b6af63fe9b5e1bb76
-SIZE (1a21df391691d9a9c7b5ebc77022385f7feb266b.patch) = 768
+TIMESTAMP = 1607803742
+SHA256 (p11-kit-0.23.22.tar.xz) = 8a8f40153dd5a3f8e7c03e641f8db400133fb2a6a9ab2aee1b6d0cb0495ec6b6
+SIZE (p11-kit-0.23.22.tar.xz) = 830016
+SHA256 (507c394cfcf4edffc5e4450c5d737e545c26b857.patch) = e92a679054ccd65b92a246a7f97c8fac7339ef6ef2c837aeefb1b9874a82cafd
+SIZE (507c394cfcf4edffc5e4450c5d737e545c26b857.patch) = 731