diff --git a/devel/etcd34/Makefile b/devel/etcd34/Makefile
index 7c731c33c93c..07a6ec272f53 100644
--- a/devel/etcd34/Makefile
+++ b/devel/etcd34/Makefile
@@ -1,36 +1,42 @@
 PORTNAME=	etcd
 PORTVERSION=	3.4.18
 DISTVERSIONPREFIX=	v
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	devel
 PKGNAMEPREFIX=	coreos-
 PKGNAMESUFFIX=	34
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Highly-available key value store and service discovery
 WWW=		https://github.com/coreos/etcd
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe go:modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	coreos
+GH_TUPLE=	golang:sys:v0.5.0:golang_sys
 
 GO_PKGNAME=	github.com/coreos/etcd
 GO_TARGET=	. ./etcdctl
 
 CONFLICTS_INSTALL=	coreos-etcd[0-9][0-9]
 
 PLIST_FILES=	bin/etcd \
 		bin/etcdctl
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 DOCS_DESC=	Install etcd README file
 
+pre-patch:
+	${RM} ${WRKSRC}/vendor/modules.txt
+	${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}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/etcd34/distinfo b/devel/etcd34/distinfo
index 380942522b99..641501c9b99c 100644
--- a/devel/etcd34/distinfo
+++ b/devel/etcd34/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1635841651
+TIMESTAMP = 1677696890
 SHA256 (coreos-etcd-v3.4.18_GH0.tar.gz) = 738edb8da01c77e4ee59f9ebbf80f2461bdcb2c320da856464b89ed301a49ecb
 SIZE (coreos-etcd-v3.4.18_GH0.tar.gz) = 8856893
+SHA256 (golang-sys-v0.5.0_GH0.tar.gz) = 810c8f1b7704674971ab6b2b614aba20a5a1765018fd2c639f528dbbcbf88b1f
+SIZE (golang-sys-v0.5.0_GH0.tar.gz) = 1429723