diff --git a/devel/gitleaks/Makefile b/devel/gitleaks/Makefile
index a5b3881a3166..cd4beac3da87 100644
--- a/devel/gitleaks/Makefile
+++ b/devel/gitleaks/Makefile
@@ -1,19 +1,26 @@
 PORTNAME=	gitleaks
 DISTVERSIONPREFIX=	v
 DISTVERSION=	8.16.1
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Tool for detecting hardcoded secrets in git repositories
 WWW=		https://github.com/zricethezav/gitleaks
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
+USE_GITHUB=	nodefault
+GH_TUPLE=	golang:sys:v0.6.0:sys
 
 GO_MODULE=	github.com/zricethezav/gitleaks/v8
 GO_TARGET=	.
 PLIST_FILES=	bin/${PORTNAME}
 
+pre-patch:
+	${RM} -r ${WRKSRC}/vendor/golang.org/x/sys
+	${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys
+
 .include <bsd.port.mk>
diff --git a/devel/gitleaks/distinfo b/devel/gitleaks/distinfo
index 9e5a732fe6ee..d87299976a52 100644
--- a/devel/gitleaks/distinfo
+++ b/devel/gitleaks/distinfo
@@ -1,5 +1,7 @@
-TIMESTAMP = 1678933059
+TIMESTAMP = 1679151844
 SHA256 (go/devel_gitleaks/gitleaks-v8.16.1/v8.16.1.mod) = e2ee6b75c4aa07e7d03da1242f9cc03cfe91843050ed3f1d99c6d5797a6f565c
 SIZE (go/devel_gitleaks/gitleaks-v8.16.1/v8.16.1.mod) = 1802
 SHA256 (go/devel_gitleaks/gitleaks-v8.16.1/v8.16.1.zip) = 514a9c2bad83aefa85775e4e6bcd1b6de523aeaba1ae2459a2daa10a944d8f17
 SIZE (go/devel_gitleaks/gitleaks-v8.16.1/v8.16.1.zip) = 203931
+SHA256 (go/devel_gitleaks/gitleaks-v8.16.1/golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54
+SIZE (go/devel_gitleaks/gitleaks-v8.16.1/golang-sys-v0.6.0_GH0.tar.gz) = 1434234