diff --git a/devel/etcd31/Makefile b/devel/etcd31/Makefile
index 0807c54e1f8c..86cc89a798ef 100644
--- a/devel/etcd31/Makefile
+++ b/devel/etcd31/Makefile
@@ -1,39 +1,47 @@
 PORTNAME=	etcd
 PORTVERSION=	3.1.20
 DISTVERSIONPREFIX=	v
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	devel
 PKGNAMEPREFIX=	coreos-
 PKGNAMESUFFIX=	31
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Highly-available key value store and service discovery
 WWW=		https://github.com/etcd-io/etcd
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe go
 USE_GITHUB=	yes
 GH_ACCOUNT=	coreos
+GH_TUPLE=	coreos:bbolt:v1.3.7:coreos_bbolt \
+		golang:sys:v0.5.0:golang_sys
 
 GO_PKGNAME=	github.com/coreos/etcd
 GO_TARGET=	./cmd/etcd ./cmd/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} -r ${GO_WRKSRC}/cmd/vendor/github.com/coreos/bbolt
+	${LN} -s ${WRKDIR}/bbolt-* ${GO_WRKSRC}/cmd/vendor/github.com/coreos/bbolt
+	${RM} -r ${GO_WRKSRC}/cmd/vendor/golang.org/x/sys
+	${LN} -s ${WRKDIR}/sys-* ${GO_WRKSRC}/cmd/vendor/golang.org/x/sys
+
 post-patch:
 	${REINPLACE_CMD} -i '' "s@#cgo LDFLAGS: -ldl@@g;" ${WRKSRC}/cmd/vendor/github.com/coreos/pkg/dlopen/dlopen.go
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/etcd31/distinfo b/devel/etcd31/distinfo
index d922adf1d928..b17688b1a1eb 100644
--- a/devel/etcd31/distinfo
+++ b/devel/etcd31/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1540561389
+TIMESTAMP = 1677694209
 SHA256 (coreos-etcd-v3.1.20_GH0.tar.gz) = 0ad1c8af21620f53487c0c3b7cfd17309b1e9de82ad05b906722061e7470091a
 SIZE (coreos-etcd-v3.1.20_GH0.tar.gz) = 2641073
+SHA256 (coreos-bbolt-v1.3.7_GH0.tar.gz) = a99c0371bd041a3ca45bd314428976f3f13408ea53dbf2f8aa74b0288889acb2
+SIZE (coreos-bbolt-v1.3.7_GH0.tar.gz) = 116699
+SHA256 (golang-sys-v0.5.0_GH0.tar.gz) = 810c8f1b7704674971ab6b2b614aba20a5a1765018fd2c639f528dbbcbf88b1f
+SIZE (golang-sys-v0.5.0_GH0.tar.gz) = 1429723