diff --git a/net/wireguard-go/Makefile b/net/wireguard-go/Makefile
index 9921675a2834..ada0cf28c108 100644
--- a/net/wireguard-go/Makefile
+++ b/net/wireguard-go/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	wireguard-go
-PORTVERSION=	0.0.20220117
+PORTVERSION=	0.0.20220316
 PORTEPOCH=	1
 CATEGORIES=	net net-vpn
-MASTER_SITES=	https://git.zx2c4.com/wireguard-go/snapshot/ \
-		LOCAL/decke
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
-		${PORTNAME}-${PORTVERSION}-vendor${EXTRACT_SUFX}
+MASTER_SITES=	https://git.zx2c4.com/wireguard-go/snapshot/
+DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	decke@FreeBSD.org
 COMMENT=	WireGuard implementation in Go
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		gmake go:modules,no_targets tar:xz
 
 USE_GITHUB=	nodefault
+GH_TUPLE=	golang:crypto:3147a52a75dd:golang_crypto/vendor/golang.org/x/crypto \
+		golang:net:27dd8689420f:golang_net/vendor/golang.org/x/net \
+		golang:sys:039c03cc5b86:golang_sys/vendor/golang.org/x/sys
 
 MAKE_ENV+=	${GO_ENV} GOFLAGS="${GO_BUILDFLAGS}"
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/net/wireguard-go/distinfo b/net/wireguard-go/distinfo
index 1696ab6097ba..04a8a31dbeed 100644
--- a/net/wireguard-go/distinfo
+++ b/net/wireguard-go/distinfo
@@ -1,5 +1,9 @@
-TIMESTAMP = 1644239004
-SHA256 (wireguard-go-0.0.20220117.tar.xz) = f4496b6db6c2f99ebbb744738dd6c93ebdbda0571b56cfb857916d20a696fe80
-SIZE (wireguard-go-0.0.20220117.tar.xz) = 109548
-SHA256 (wireguard-go-0.0.20220117-vendor.tar.xz) = 5d049eaecc78cbb4511cf0d93e00dfcd2e4e7c615cc50d14d6d19f6b861244c9
-SIZE (wireguard-go-0.0.20220117-vendor.tar.xz) = 533936
+TIMESTAMP = 1648137564
+SHA256 (wireguard-go-0.0.20220316.tar.xz) = fd6759c116e358d311309e049cc2dcc390bc326710f5fc175e0217b755330c2a
+SIZE (wireguard-go-0.0.20220316.tar.xz) = 110444
+SHA256 (golang-crypto-3147a52a75dd_GH0.tar.gz) = 25542a72981bc3c33fca702a21feae4d6242298255354cfa2359d6195ff8656a
+SIZE (golang-crypto-3147a52a75dd_GH0.tar.gz) = 1630551
+SHA256 (golang-net-27dd8689420f_GH0.tar.gz) = e72ae02627807460cd899f85e9043f3b5047f2842b82457f5c7b18466f791eaf
+SIZE (golang-net-27dd8689420f_GH0.tar.gz) = 1229548
+SHA256 (golang-sys-039c03cc5b86_GH0.tar.gz) = 9f36b281dd59ba287f2475865318a77341ef5cd2fe8a94b958a776d3fdc3377e
+SIZE (golang-sys-039c03cc5b86_GH0.tar.gz) = 1288651