diff --git a/textproc/csvq/Makefile b/textproc/csvq/Makefile
index 5d896be3182f..a6b850c730e8 100644
--- a/textproc/csvq/Makefile
+++ b/textproc/csvq/Makefile
@@ -1,28 +1,34 @@
 PORTNAME=	csvq
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.17.11
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc
 
 MAINTAINER=	lcook@FreeBSD.org
 COMMENT=	SQL-like query language for csv
 WWW=		https://mithrandie.github.io/csvq/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
+USE_GITHUB=	nodefault
+GH_TUPLE=	golang:sys:v0.6.0:sys
 
 GO_MODULE=	github.com/mithrandie/${PORTNAME}
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	CHANGELOG.md README.md
 
 OPTIONS_DEFINE=	DOCS
 
+pre-build:
+	${RM} -r ${WRKSRC}/vendor/golang.org/x/sys
+	${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys
+
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} \
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/textproc/csvq/distinfo b/textproc/csvq/distinfo
index a57e217cd904..5ecd9a6e3b8c 100644
--- a/textproc/csvq/distinfo
+++ b/textproc/csvq/distinfo
@@ -1,5 +1,7 @@
-TIMESTAMP = 1670895635
+TIMESTAMP = 1679529181
 SHA256 (go/textproc_csvq/csvq-v1.17.11/v1.17.11.mod) = 82173bfa6006aee9ec40f90e5a9a9d8be296fcce7bdfba65a3bfc8d6ed018355
 SIZE (go/textproc_csvq/csvq-v1.17.11/v1.17.11.mod) = 687
 SHA256 (go/textproc_csvq/csvq-v1.17.11/v1.17.11.zip) = 1ee838ce04c7a1abcf32cd652b9e5325710ec21fd60898cc7555eeeca50ac7ba
 SIZE (go/textproc_csvq/csvq-v1.17.11/v1.17.11.zip) = 1556397
+SHA256 (go/textproc_csvq/csvq-v1.17.11/golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54
+SIZE (go/textproc_csvq/csvq-v1.17.11/golang-sys-v0.6.0_GH0.tar.gz) = 1434234