diff --git a/devel/etcd36/Makefile b/devel/etcd36/Makefile
index 113f3f8ad1e9..3d3227bd2254 100644
--- a/devel/etcd36/Makefile
+++ b/devel/etcd36/Makefile
@@ -1,66 +1,66 @@
 PORTNAME=	etcd
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.6.14
+DISTVERSION=	3.6.15
 CATEGORIES=	devel
 MASTER_SITES=	https://raw.githubusercontent.com/etcd-io/${PORTNAME}/${DISTVERSIONFULL}/:gomod
 PKGNAMEPREFIX=	coreos-
 PKGNAMESUFFIX=	36
 DISTFILES=	go.mod:gomod \
 		api/go.mod:gomod \
 		pkg/go.mod:gomod \
 		client/pkg/go.mod:gomod \
 		client/v3/go.mod:gomod \
 		etcdctl/go.mod:gomod \
 		etcdutl/go.mod:gomod \
 		server/go.mod:gomod \
 		tests/go.mod:gomod
 
 MAINTAINER=	0mp@FreeBSD.org
 COMMENT=	Highly-available key value store and service discovery
 WWW=		https://etcd.io/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe go:modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	etcd-io
 GO_MODULE=	go.etcd.io/etcd/v3
 GO_MOD_DIST=	github
 GO_TARGET=	./etcdctl ./etcdutl ./server
 
 CONFLICTS_INSTALL=	coreos-etcd[0-9][0-9]
 
 PLIST_FILES=	bin/etcd \
 		bin/etcdctl \
 		bin/etcdutl
 
 # This target is based on the post-extract target from Uses/go.mk
 post-extract:
 .for gt in ${GO_TARGET:T}
 	@${ECHO_MSG} "===> Tidying ${GO_MODNAME} dependencies";
 	@(cd ${GO_WRKSRC}/${gt}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} mod tidy -e)
 	@${ECHO_MSG} "===> Vendoring ${GO_MODNAME} dependencies";
 	@(cd ${GO_WRKSRC}/${gt}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} mod vendor -e)
 .endfor
 
 # This target is based on the do-build target from Uses/go.mk.
 do-build:
 .for gt in ${GO_TARGET:T}
 	(cd ${GO_WRKSRC}/${gt}; \
 	for t in ${gt}; do \
 		out=$$(${BASENAME} $$(${ECHO_CMD} $${t} | \
 			${SED} -Ee 's/^[^:]*:([^:]+).*$$/\1/' -e 's/^\.$$/${PORTNAME}/')); \
 		pkg=$$(${ECHO_CMD} $${t} | \
 			${SED} -Ee 's/^([^:]*).*$$/\1/' -e 's/^${PORTNAME}$$/./'); \
 		${ECHO_MSG} "===>  Building $${out} from $${pkg}"; \
 		${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOMAXPROCS=${MAKE_JOBS_NUMBER} GOPROXY=off ${GO_CMD} build ${GO_BUILDFLAGS} \
 			-o ${GO_WRKDIR_BIN}/$${out} \
 			.; \
 	done)
 .endfor
 
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/bin/server ${STAGEDIR}${PREFIX}/bin/etcd
 
 .include <bsd.port.mk>
diff --git a/devel/etcd36/distinfo b/devel/etcd36/distinfo
index c1e8e0aab728..0c6d8446bb1f 100644
--- a/devel/etcd36/distinfo
+++ b/devel/etcd36/distinfo
@@ -1,21 +1,21 @@
-TIMESTAMP = 1789554736
-SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.14_GH0/go.mod) = e39df4759aa170788fd6abe91e3c9b1f513b508e82c1903cda95faf33b472eff
-SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.14_GH0/go.mod) = 4383
-SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.14_GH0/api/go.mod) = bf2c7b59b87dd8ace27d413867116c82c6b044014e426be400526316d5448fae
-SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.14_GH0/api/go.mod) = 1216
-SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.14_GH0/pkg/go.mod) = ca4d126aa05891c4a059f37aa74b35147a153f572b56dc052e467866fbc9b42c
-SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.14_GH0/pkg/go.mod) = 1367
-SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.14_GH0/client/pkg/go.mod) = 9c152efa1d5c604f78e5153af1948ada067b63d0f0748a96a033c5d07f4974cc
-SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.14_GH0/client/pkg/go.mod) = 561
-SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.14_GH0/client/v3/go.mod) = ed7914b00e7853ae1ee568d364e4e5e4184c05a9013b914dd4015766f01a6c82
-SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.14_GH0/client/v3/go.mod) = 2041
-SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.14_GH0/etcdctl/go.mod) = bd271ed25421ae27148ef419c2746c5eaeea72d33835cdcda0cc7c5c16eccaca
-SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.14_GH0/etcdctl/go.mod) = 2109
-SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.14_GH0/etcdutl/go.mod) = 0922cd79adb1b1d442ec807994c0b778adb0da14988341f5bfc638e06fe8aec5
-SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.14_GH0/etcdutl/go.mod) = 4006
-SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.14_GH0/server/go.mod) = d4620a77c231c52d09f3d1114e0d50d68d42ba2652691d69e2ca2748895025de
-SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.14_GH0/server/go.mod) = 3595
-SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.14_GH0/tests/go.mod) = df01899075cbfab341a4f4fe4c29163a6a766cf8979de58c39a5bf0ed6ed05e5
-SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.14_GH0/tests/go.mod) = 4509
-SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.14_GH0/etcd-io-etcd-v3.6.14_GH0.tar.gz) = a7ac1ed4192c6e53e4716df3e08bc75e4f929fcb186a9d9e5b0aaf11c96b067a
-SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.14_GH0/etcd-io-etcd-v3.6.14_GH0.tar.gz) = 7389983
+TIMESTAMP = 1790934728
+SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.15_GH0/go.mod) = c2f22d98a1fcdd37229e957c575f3585d567a17a76e4dac7626f6dc3189a5247
+SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.15_GH0/go.mod) = 4380
+SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.15_GH0/api/go.mod) = 21c113094bc41bd75568ae3a795ab7dc9717e0f95dd3026dd010f935d3bb247c
+SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.15_GH0/api/go.mod) = 1213
+SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.15_GH0/pkg/go.mod) = a33a8be8350b9fbf09d9bc753b2d36b11ebb3876745b63bf85f42ce00952a3f6
+SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.15_GH0/pkg/go.mod) = 1364
+SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.15_GH0/client/pkg/go.mod) = f6bbd3200533d06b7427905be2c690e273700891ffe8ef92e18026f71317b5c8
+SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.15_GH0/client/pkg/go.mod) = 558
+SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.15_GH0/client/v3/go.mod) = 1dc5bc99290b52675e4e9acabbf05bc125b174b3948ef30b51357167247eed84
+SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.15_GH0/client/v3/go.mod) = 2038
+SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.15_GH0/etcdctl/go.mod) = e62e5f63a22e6e6147d59d3b649923e9852136bc3dc7d925a36d96a6652c4330
+SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.15_GH0/etcdctl/go.mod) = 2106
+SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.15_GH0/etcdutl/go.mod) = 0469d711ba1f38d2aa80610927df759346b2e120565170b084b7ff13bd515637
+SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.15_GH0/etcdutl/go.mod) = 4003
+SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.15_GH0/server/go.mod) = a0677171f2bd608e2ffbf555a2a680618608b99c90858c19e6fcbb78a5781e45
+SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.15_GH0/server/go.mod) = 3592
+SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.15_GH0/tests/go.mod) = 0db06ea75405998e5817ec345a136ead5f13e7a7e71f2b48c4881e10e6348238
+SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.15_GH0/tests/go.mod) = 4506
+SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.15_GH0/etcd-io-etcd-v3.6.15_GH0.tar.gz) = ea260a238dce73b7c4b06d03aeed64d841ec59041fa3d83935e257784e6c8f78
+SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.15_GH0/etcd-io-etcd-v3.6.15_GH0.tar.gz) = 7391783