diff --git a/security/keybase/Makefile b/security/keybase/Makefile
index a9438dd1efb3..f5b111a1e48d 100644
--- a/security/keybase/Makefile
+++ b/security/keybase/Makefile
@@ -1,31 +1,29 @@
 PORTNAME=	keybase
 PORTVERSION=	6.3.1
 DISTVERSIONPREFIX=	v
 PORTREVISION=	2
 CATEGORIES=	security
-MASTER_SITES=	https://raw.githubusercontent.com/keybase/client/v${PORTVERSION}/go/:gomod
-DISTFILES=	go.mod:gomod
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Keybase.io client and Keybase Filesystem (KBFS)
 WWW=		https://keybase.io/docs/command_line \
 		https://keybase.io/docs/kbfs \
 		https://github.com/keybase/client
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 USES=		cpe go:modules
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	keybase
 GH_PROJECT=	client
 
 GO_BUILDFLAGS=	-tags production
+GO_MOD_DIST=	github
 GO_MODULE=	github.com/keybase/client/go
 GO_TARGET=	./keybase ./kbfs/kbfsfuse ./kbfs/kbfsgit/git-remote-keybase ./kbfs/kbfstool
 WRKSRC_SUBDIR=	go
 
 PLIST_FILES=	bin/git-remote-keybase bin/kbfsfuse bin/kbfstool bin/keybase
 
 .include <bsd.port.mk>