diff --git a/security/py-keepkey/Makefile b/security/py-keepkey/Makefile
index 0e18329d09b5..49b8564dc628 100644
--- a/security/py-keepkey/Makefile
+++ b/security/py-keepkey/Makefile
@@ -1,25 +1,29 @@
 # Created by: Emanuel Haupt <ehaupt@FreeBSD.org>
 
 PORTNAME=	keepkey
-PORTVERSION=	6.6.0
+PORTVERSION=	6.7.0
+DISTVERSIONPREFIX=	v
 CATEGORIES=	security
-MASTER_SITES=	https://github.com/${PORTNAME}/python-${PORTNAME}/releases/download/v${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Library for communicating with KeepKey Hardware Wallet
 
 LICENSE=	LGPL3
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ecdsa>=0.9:security/py-ecdsa@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}protobuf>=3.0.0:devel/py-protobuf@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}mnemonic>=0.8:security/py-mnemonic@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hidapi>=0.7.99.post15:comms/py-hidapi@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}libusb1>=1.6:devel/py-libusb1@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}libusb1>=1.6:devel/py-libusb1@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}mnemonic>=0.8:security/py-mnemonic@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}protobuf>=3.0.0:devel/py-protobuf@${PY_FLAVOR}
 
 USES=		python:3.6+
+USE_GITHUB=	yes
+GH_PROJECT=	python-keepkey
+GH_TUPLE=	keepkey:device-protocol:84d438b:devproto/device-protocol \
+		keepkey:ethereum-lists:e216e92:ethlist/keepkeylib/eth/ethereum-lists
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/security/py-keepkey/distinfo b/security/py-keepkey/distinfo
index b2680b89d033..b0a2c69c82f7 100644
--- a/security/py-keepkey/distinfo
+++ b/security/py-keepkey/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1611692066
-SHA256 (keepkey-6.6.0.tar.gz) = a5cf1949a3a2018b9723fb4a7121f910b0828f5b069efa5b468ae1906a8b7346
-SIZE (keepkey-6.6.0.tar.gz) = 170294
+TIMESTAMP = 1620454413
+SHA256 (keepkey-python-keepkey-v6.7.0_GH0.tar.gz) = 623e6be6987440ef638341a304a04de60cd280c2e42122fcbd19fda67717b209
+SIZE (keepkey-python-keepkey-v6.7.0_GH0.tar.gz) = 231248
+SHA256 (keepkey-device-protocol-84d438b_GH0.tar.gz) = fbbccb73411c68fa45b2f0e71045834fc262a9980980b474d96e202e2a939f72
+SIZE (keepkey-device-protocol-84d438b_GH0.tar.gz) = 43636
+SHA256 (keepkey-ethereum-lists-e216e92_GH0.tar.gz) = 25bd68921271a3193aaaf5e9b5cdad16259d5dcabd221d575c9294b42924d18b
+SIZE (keepkey-ethereum-lists-e216e92_GH0.tar.gz) = 84560657