diff --git a/security/pkcs11-tools/Makefile b/security/pkcs11-tools/Makefile
index c605382b4c50..ab60221eb2bc 100644
--- a/security/pkcs11-tools/Makefile
+++ b/security/pkcs11-tools/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	pkcs11-tools
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.4.2
+DISTVERSION=	2.5.0
 CATEGORIES=	security
 
 MAINTAINER=	eric.devolder@gmail.com
@@ -12,17 +12,15 @@ BROKEN_SSL=	libressl
 BROKEN_SSL_REASON_libressl=	error: use of undeclared identifier 'EVP_PKEY_X25519' (LibreSSL has no support for Edwards curves)
 
 BUILD_DEPENDS=	autoconf-archive>0:devel/autoconf-archive \
-		autoconf>0:devel/autoconf \
-		automake>0:devel/automake \
 		flex:textproc/flex
 RUN_DEPENDS=	bash:shells/bash
 
-USES=		bison compiler:c11 libtool:build pkgconfig ssl
+USES=		bison compiler:c11 libtool:build pkgconfig ssl autoreconf
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Mastercard
-GH_TUPLE=	coreutils:gnulib:5b3a6f94f:gnulib \
-		oasis-tcs:pkcs11:df530bf:oasis_pkcs11
+GH_TUPLE=	coreutils:gnulib:3148eb10e:gnulib \
+		oasis-tcs:pkcs11:a136aac:oasis_pkcs11
 
 GNU_CONFIGURE=	yes
 
diff --git a/security/pkcs11-tools/distinfo b/security/pkcs11-tools/distinfo
index a36117369658..376fed5be795 100644
--- a/security/pkcs11-tools/distinfo
+++ b/security/pkcs11-tools/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1632506929
-SHA256 (Mastercard-pkcs11-tools-v2.4.2_GH0.tar.gz) = 12089000a94e62c3821e7c64113e35d294d7942a94beebe4ac827f9b45b27396
-SIZE (Mastercard-pkcs11-tools-v2.4.2_GH0.tar.gz) = 285850
-SHA256 (coreutils-gnulib-5b3a6f94f_GH0.tar.gz) = 93ab4c723fc482a531dc55a28c9da5d7907a3402bcef4e99f4d8168415ae3a71
-SIZE (coreutils-gnulib-5b3a6f94f_GH0.tar.gz) = 7293249
-SHA256 (oasis-tcs-pkcs11-df530bf_GH0.tar.gz) = a1e9203c463fe1187d89d2f29b5453f9bda84c55f31a91c12638d113fc2214cb
-SIZE (oasis-tcs-pkcs11-df530bf_GH0.tar.gz) = 119448
+TIMESTAMP = 1633588514
+SHA256 (Mastercard-pkcs11-tools-v2.5.0_GH0.tar.gz) = 62ae959471084fff4d8262c56655cb328b5d049e138a3f6602bb20b77a36283b
+SIZE (Mastercard-pkcs11-tools-v2.5.0_GH0.tar.gz) = 294252
+SHA256 (coreutils-gnulib-3148eb10e_GH0.tar.gz) = 266ed3348da1629c8b8e4e1adc6a8f6ec5bb523707556a56ca51d3d74eeee5e2
+SIZE (coreutils-gnulib-3148eb10e_GH0.tar.gz) = 7420208
+SHA256 (oasis-tcs-pkcs11-a136aac_GH0.tar.gz) = 5bb41d167ac60a58ba85526c4cd81324599d66a36567eed1aed3bad93c6e3705
+SIZE (oasis-tcs-pkcs11-a136aac_GH0.tar.gz) = 119794