diff --git a/databases/octosql/Makefile b/databases/octosql/Makefile
index d2aae8ee3165..b2fe92bf11ef 100644
--- a/databases/octosql/Makefile
+++ b/databases/octosql/Makefile
@@ -1,20 +1,26 @@
 PORTNAME=	octosql
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.12.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	OctoSQL is a query tool for databases, file formats, etc
 WWW=		https://github.com/cube2222/octosql
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
+USE_GITHUB=	nodefault
+GH_TUPLE=	golang:sys:v0.6.0:sys
 
 GO_MODULE=	github.com/cube2222/octosql
 
 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/databases/octosql/distinfo b/databases/octosql/distinfo
index e857939dd284..f5d838af7b67 100644
--- a/databases/octosql/distinfo
+++ b/databases/octosql/distinfo
@@ -1,5 +1,7 @@
-TIMESTAMP = 1678349628
+TIMESTAMP = 1679676260
 SHA256 (go/databases_octosql/octosql-v0.12.1/v0.12.1.mod) = 1e5d06815e23c0cef139d7731724c38acd2ca8c2a9b27278e82f4d159d1fd1b6
 SIZE (go/databases_octosql/octosql-v0.12.1/v0.12.1.mod) = 3279
 SHA256 (go/databases_octosql/octosql-v0.12.1/v0.12.1.zip) = bca564157e372fbd41c2c8cdf6f52cb726645ee903a1064310f73d771715d715
 SIZE (go/databases_octosql/octosql-v0.12.1/v0.12.1.zip) = 2341157
+SHA256 (go/databases_octosql/octosql-v0.12.1/golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54
+SIZE (go/databases_octosql/octosql-v0.12.1/golang-sys-v0.6.0_GH0.tar.gz) = 1434234