diff --git a/net/cloudquery/Makefile b/net/cloudquery/Makefile
index 1342d326481b..01ebed78b557 100644
--- a/net/cloudquery/Makefile
+++ b/net/cloudquery/Makefile
@@ -1,20 +1,26 @@
 PORTNAME=	cloudquery
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.31.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	net
 
 MAINTAINER=	se@FreeBSD.org
 COMMENT=	Transform cloud infrastructure into queryable SQL tables
 WWW=		https://cloudquery.io/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
+USE_GITHUB=	nodefault
+GH_TUPLE=	golang:sys:v0.6.0:sys
 
 GO_MODULE=	github.com/cloudquery/cloudquery
 
 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/net/cloudquery/distinfo b/net/cloudquery/distinfo
index d99e1b626b79..4cb726b0f80e 100644
--- a/net/cloudquery/distinfo
+++ b/net/cloudquery/distinfo
@@ -1,5 +1,7 @@
-TIMESTAMP = 1657003062
+TIMESTAMP = 1679532464
 SHA256 (go/net_cloudquery/cloudquery-v0.31.0/v0.31.0.mod) = 17a817340c431290dce8cefb6c6c6834329949d5d152d4d06c6417d8f714c744
 SIZE (go/net_cloudquery/cloudquery-v0.31.0/v0.31.0.mod) = 9396
 SHA256 (go/net_cloudquery/cloudquery-v0.31.0/v0.31.0.zip) = 7ea0cbeb286939ffc795e55555f11070b58282590caf2377149edc7ee837690d
 SIZE (go/net_cloudquery/cloudquery-v0.31.0/v0.31.0.zip) = 331998
+SHA256 (go/net_cloudquery/cloudquery-v0.31.0/golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54
+SIZE (go/net_cloudquery/cloudquery-v0.31.0/golang-sys-v0.6.0_GH0.tar.gz) = 1434234