diff --git a/net/cf/Makefile b/net/cf/Makefile
index 8645cac98bb3..0331051e998d 100644
--- a/net/cf/Makefile
+++ b/net/cf/Makefile
@@ -1,40 +1,45 @@
 PORTNAME=	cf
 PORTVERSION=	6.49.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	net
 
 MAINTAINER=	dumbbell@FreeBSD.org
 COMMENT=	CLI for Cloud Foundry written in Go
 WWW=		https://cloudfoundry.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/go-bindata:devel/go-bindata
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	cloudfoundry
 GH_PROJECT=	cli
+GH_TUPLE=	golang:sys:v0.6.0:sys
 
 USES=		go
 
 CONFLICTS_INSTALL=	lbl-cf # bin/cf
 
 GO_BUILDFLAGS=	-ldflags="-X code.cloudfoundry.org/cli/version.binaryVersion=${PORTVERSION}"
 GO_PKGNAME=	code.cloudfoundry.org/cli
 GO_TARGET=	:cf
 
 PLIST_FILES=	bin/cf
 
 PORTDOCS=	NOTICE README.md
 
 OPTIONS_DEFINE=	DOCS
 
+pre-patch:
+	${RM} -r ${WRKSRC}/vendor/golang.org/x/sys
+	${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys
+
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for x in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${x} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/net/cf/distinfo b/net/cf/distinfo
index 71112aef9697..989d22621b19 100644
--- a/net/cf/distinfo
+++ b/net/cf/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1581177489
+TIMESTAMP = 1679327145
 SHA256 (cloudfoundry-cli-v6.49.0_GH0.tar.gz) = 7717d3b684c1553b98e13888704d88197447984057b8a4ba0cdf2ec862613761
 SIZE (cloudfoundry-cli-v6.49.0_GH0.tar.gz) = 22715242
-SHA256 (golang-sys-fead79001313_GH0.tar.gz) = c8e102db152c51438f426a92b338f924827b960e75bd9d871ae9438135366073
-SIZE (golang-sys-fead79001313_GH0.tar.gz) = 1258330
+SHA256 (golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54
+SIZE (golang-sys-v0.6.0_GH0.tar.gz) = 1434234