diff --git a/security/keybase/Makefile b/security/keybase/Makefile
index 6cea50657197..5688bf69a073 100644
--- a/security/keybase/Makefile
+++ b/security/keybase/Makefile
@@ -1,24 +1,30 @@
 PORTNAME=	keybase
-PORTVERSION=	5.8.1
-PORTREVISION=	7
+PORTVERSION=	6.0.4
 DISTVERSIONPREFIX=	v
-MASTER_SITES=	https://github.com/keybase/client/releases/download/v${PORTVERSION}/
+MASTER_SITES=	https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/go/:gomod
+#MASTER_SITES=	https://raw.githubusercontent.com/keybase/client/v${PORTVERSION}/go/:gomod
 CATEGORIES=	security
+DISTFILES=	go.mod:gomod
+
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Keybase.io client and Keybase Filesystem (KBFS)
 WWW=		https://keybase.io/docs/command_line
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
-USES=		cpe go tar:xz
+USES=		cpe go:modules tar:xz
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	keybase
+GH_PROJECT=	client
 
+GO_MODULE=	github.com/keybase/client/go
+GO_TARGET=	./keybase ./kbfs/kbfsfuse ./kbfs/kbfsgit/git-remote-keybase ./kbfs/kbfstool
 GO_BUILDFLAGS=	-tags production
-GO_PKGNAME=	github.com/keybase/client/go
-GO_TARGET=	${GO_PKGNAME}/keybase ${GO_PKGNAME}/kbfs/kbfsfuse ${GO_PKGNAME}/kbfs/kbfsgit/git-remote-keybase ${GO_PKGNAME}/kbfs/kbfstool
-WRKSRC=		${WRKDIR}/client-v${PORTVERSION}/go
+WRKSRC_SUBDIR=	go
 
 PLIST_FILES=	bin/git-remote-keybase bin/kbfsfuse bin/kbfstool bin/keybase
 
 .include <bsd.port.mk>
diff --git a/security/keybase/distinfo b/security/keybase/distinfo
index b6f8438f307a..cfda128077d9 100644
--- a/security/keybase/distinfo
+++ b/security/keybase/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1654708328
-SHA256 (keybase-v5.8.1.tar.xz) = 5e89792105ce29420e92ebeaf8055db5e7d67de5e181f83f69904356ddeb8c71
-SIZE (keybase-v5.8.1.tar.xz) = 60142348
+TIMESTAMP = 1675622993
+SHA256 (go/security_keybase/keybase-client-v6.0.4_GH0/go.mod) = c1d31be5d590ee197dffea7799c62ca1395fe340c3c8d1e68736e6c4b49446ad
+SIZE (go/security_keybase/keybase-client-v6.0.4_GH0/go.mod) = 18849
+SHA256 (go/security_keybase/keybase-client-v6.0.4_GH0/keybase-client-v6.0.4_GH0.tar.gz) = 10f1b0fbee30520091a2005886947e34ea8d0f3dc3197a80563e5eb12664cc59
+SIZE (go/security_keybase/keybase-client-v6.0.4_GH0/keybase-client-v6.0.4_GH0.tar.gz) = 57268878
diff --git a/security/keybase/files/patch-vendor-golang.org-x-sys-unix-ztypes_freebsd_arm64.go b/security/keybase/files/patch-vendor-golang.org-x-sys-unix-ztypes_freebsd_arm64.go
deleted file mode 100644
index ba20c450f784..000000000000
--- a/security/keybase/files/patch-vendor-golang.org-x-sys-unix-ztypes_freebsd_arm64.go
+++ /dev/null
@@ -1,13 +0,0 @@
-Obtained from:	https://github.com/golang/sys/commit/33540a1f603772f9d4b761f416f5c10dade23e96
-
---- vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go.orig	2020-03-10 17:25:08 UTC
-+++ vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go
-@@ -397,7 +397,7 @@ type Reg struct {
- }
- 
- type FpReg struct {
--	Fp_q  [32]uint128
-+	Fp_q  [512]uint8
- 	Fp_sr uint32
- 	Fp_cr uint32
- }