diff --git a/databases/influxdb2-cli/Makefile b/databases/influxdb2-cli/Makefile
index 41c1c4feb5c3..e457b2cc592a 100644
--- a/databases/influxdb2-cli/Makefile
+++ b/databases/influxdb2-cli/Makefile
@@ -1,23 +1,29 @@
 PORTNAME=	influxdb2-cli
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.6.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	databases net-mgmt
 
 MAINTAINER=	driesm@FreeBSD.org
 COMMENT=	CLI for managing resources in InfluxDB v2
 WWW=		https://github.com/influxdata/influx-cli
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
+USE_GITHUB=	nodefault
+GH_TUPLE=	golang:sys:v0.6.0:sys
 
 GO_MODULE=	github.com/influxdata/influx-cli/v2
 GO_TARGET=	./cmd/influx
 
 CONFLICTS_INSTALL=	influxdb
 
 PLIST_FILES=	bin/influx
 
+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/databases/influxdb2-cli/distinfo b/databases/influxdb2-cli/distinfo
index 4cf2d9c80762..1367ec37a25f 100644
--- a/databases/influxdb2-cli/distinfo
+++ b/databases/influxdb2-cli/distinfo
@@ -1,5 +1,7 @@
-TIMESTAMP = 1672422342
+TIMESTAMP = 1678528993
 SHA256 (go/databases_influxdb2-cli/influxdb2-cli-v2.6.1/v2.6.1.mod) = bf97a68fd52205cc4c591b84e79dcc2946039080f6bcc08aadf08632aff81fc3
 SIZE (go/databases_influxdb2-cli/influxdb2-cli-v2.6.1/v2.6.1.mod) = 2517
 SHA256 (go/databases_influxdb2-cli/influxdb2-cli-v2.6.1/v2.6.1.zip) = e0dfdd24e8c2247a837d8b320a94a729fa10edfc7368201daf7ccd65442be021
 SIZE (go/databases_influxdb2-cli/influxdb2-cli-v2.6.1/v2.6.1.zip) = 856880
+SHA256 (go/databases_influxdb2-cli/influxdb2-cli-v2.6.1/golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54
+SIZE (go/databases_influxdb2-cli/influxdb2-cli-v2.6.1/golang-sys-v0.6.0_GH0.tar.gz) = 1434234