diff --git a/security/py-badkeys/Makefile b/security/py-badkeys/Makefile
index 7930158665c1..efe3931f4308 100644
--- a/security/py-badkeys/Makefile
+++ b/security/py-badkeys/Makefile
@@ -1,21 +1,32 @@
 PORTNAME=	badkeys
-DISTVERSION=	0.0.6
+DISTVERSION=	0.0.8
 CATEGORIES=	security python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	otis@FreeBSD.org
 COMMENT=	Tool to check public keys for known vulnerabilities
 WWW=		https://github.com/badkeys/badkeys
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gmpy2>0:math/py-gmpy2@${PY_FLAVOR}
+BUILD_DEPENDS=	${PY_SETUPTOOLS} \
+		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=7:devel/py-setuptools-scm@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}gmpy2>0:math/py-gmpy2@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist cryptography distutils
+USE_PYTHON=	autoplist cryptography pep517
 
 NO_ARCH=	yes
 
+OPTIONS_DEFINE=	SSH URLLOOKUP
+
+URLLOOKUP_DESC=	Lookup keys also in URLs
+
+SSH_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR}
+URLLOOKUP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}binary_file_search>0:devel/py-binary_file_search@${PY_FLAVOR}
+
 .include <bsd.port.mk>
diff --git a/security/py-badkeys/distinfo b/security/py-badkeys/distinfo
index 31cfc5baf95e..29e02677ccf9 100644
--- a/security/py-badkeys/distinfo
+++ b/security/py-badkeys/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1699484167
-SHA256 (badkeys-0.0.6.tar.gz) = ead74de1a60844bbd8019710aa8314ecde82ac077eee72d68a6f185e7ab5ee48
-SIZE (badkeys-0.0.6.tar.gz) = 370884
+TIMESTAMP = 1714378964
+SHA256 (badkeys-0.0.8.tar.gz) = 158953a0f695e2d56bee7c41ec8bc0958a6465f7d555e5583deee62dbbed3902
+SIZE (badkeys-0.0.8.tar.gz) = 372562