diff --git a/net/bosh-bootloader/Makefile b/net/bosh-bootloader/Makefile
index a1ffcf84ceac..4e9f9c87ccfd 100644
--- a/net/bosh-bootloader/Makefile
+++ b/net/bosh-bootloader/Makefile
@@ -1,27 +1,30 @@
 PORTNAME=	bosh-bootloader
 PORTVERSION=	7.6.0
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	net sysutils
 
 MAINTAINER=	dumbbell@FreeBSD.org
 COMMENT=	CLI for standing up CloudFoundry or Concourse on an IAAS
 WWW=		https://github.com/cloudfoundry/bosh-bootloader
 
 LICENSE=	APACHE20
 
-BROKEN_aarch64= fails to build: vendor/golang.org/x/sys/unix/cap_freebsd.go:18:23: undefined: CAP_RIGHTS_VERSION_00
-
 USE_GITHUB=	yes
-GH_TUPLE=	cloudfoundry:bosh-bootloader:v${PORTVERSION}
+GH_TUPLE=	cloudfoundry:bosh-bootloader:v${PORTVERSION} \
+		golang:sys:v0.6.0:sys
 
 USES=		go tar:xz
 
 GO_PKGNAME=	github.com/cloudfoundry/bosh-bootloader
 GO_TARGET=	github.com/cloudfoundry/bosh-bootloader/bbl
 
 PLIST_FILES=	bin/bbl
 
+pre-patch:
+	${RM} -r ${WRKSRC}/vendor/golang.org/x/sys
+	${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys
+
 post-patch:
 	${REINPLACE_CMD} -E -e 's|(Version = )"dev"|\1"${PORTVERSION}"|' ${WRKSRC}/bbl/main.go
 
 .include <bsd.port.mk>
diff --git a/net/bosh-bootloader/distinfo b/net/bosh-bootloader/distinfo
index f8ed3f58296f..57720b089cee 100644
--- a/net/bosh-bootloader/distinfo
+++ b/net/bosh-bootloader/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1557134989
+TIMESTAMP = 1679927440
 SHA256 (cloudfoundry-bosh-bootloader-7.6.0-v7.6.0_GH0.tar.gz) = d82e6f02c176933228026225718b2142dba6d076e005665faf3880a82cbb4f8d
 SIZE (cloudfoundry-bosh-bootloader-7.6.0-v7.6.0_GH0.tar.gz) = 9225507
+SHA256 (golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54
+SIZE (golang-sys-v0.6.0_GH0.tar.gz) = 1434234