diff --git a/devel/etcd36/Makefile b/devel/etcd36/Makefile
index 9ff56018b469..31d4f5f07748 100644
--- a/devel/etcd36/Makefile
+++ b/devel/etcd36/Makefile
@@ -1,67 +1,69 @@
 PORTNAME=	etcd
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.6.0-rc.4
-PORTREVISION=	1
+DISTVERSION=	3.6.5
 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
 
+NOT_FOR_ARCHS=	aarch64
+NOT_FOR_ARCHS_REASON=	fails to fetch: v0.0.1-go1.23.8.freebsd-arm64.lock: no locks available
+
 USES=		cpe go:1.23,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 a047b821055f..a42362c75426 100644
--- a/devel/etcd36/distinfo
+++ b/devel/etcd36/distinfo
@@ -1,21 +1,21 @@
-TIMESTAMP = 1746453492
-SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/go.mod) = dc9bf0b21ae0ab300e96e60bfcd3a2c73b5ebcfb36a6c717db0ffba789d753af
-SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/go.mod) = 4411
-SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/api/go.mod) = 55ef5a76dc335dc032b34457773e652b3ffde8d1586cdab9168c0f9fe78b2060
-SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/api/go.mod) = 1271
-SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/pkg/go.mod) = 3e492c667484b2b94cb0ad5132da101ddc24dfd97831ab55acfadf8136468ec4
-SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/pkg/go.mod) = 1463
-SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/client/pkg/go.mod) = e71fd432af21536333c9da0751d3cb9d9dde0925a5a6efa1d321d9123fb04183
-SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/client/pkg/go.mod) = 560
-SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/client/v3/go.mod) = 98130a7a95edc45eef055388dfdcd8fd41784f77ec8e10087f6c0ee272067040
-SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/client/v3/go.mod) = 2152
-SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/etcdctl/go.mod) = 30624d3d842493d3cad7f1368db25f9d6bb204005c17028ab083367836b0cefd
-SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/etcdctl/go.mod) = 2170
-SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/etcdutl/go.mod) = b56fcff0f42f5e75f68d812338d7982e5059465350234e9042e3933a5b1eee20
-SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/etcdutl/go.mod) = 4022
-SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/server/go.mod) = da9ea9e1d8b71a8a4adf43ed5ad7143a05c8871bc05c6c059fe0d3579aa0b25c
-SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/server/go.mod) = 3607
-SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/tests/go.mod) = ab486a67087d038c337b21064dacac69a504ffea4697aa3ebf8981b201521b34
-SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/tests/go.mod) = 4533
-SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/etcd-io-etcd-v3.6.0-rc.4_GH0.tar.gz) = fdeb4fce1d58214bd63341f2cd5230848eba4895e335e265eaf52ce7144b73ca
-SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.0-rc.4_GH0/etcd-io-etcd-v3.6.0-rc.4_GH0.tar.gz) = 7370001
+TIMESTAMP = 1762874258
+SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.5_GH0/go.mod) = 35f0570af3d669dfdf4bf70dee2f7b3b98e9f25867ad74abe98bd87821b87f62
+SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.5_GH0/go.mod) = 4369
+SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.5_GH0/api/go.mod) = 39bc9b70c8d9334263d4ebecb3dba8fea4045164938ae8c36b421aa4d2bf17ff
+SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.5_GH0/api/go.mod) = 1212
+SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.5_GH0/pkg/go.mod) = 22de51f204809b81e3f55a7d45b14b15d0e4fa32ca64972d3a25e1f016be2df9
+SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.5_GH0/pkg/go.mod) = 1360
+SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.5_GH0/client/pkg/go.mod) = b666b39755b5e2f6ad6e4b319b4e6a99d30a7b2f7ef8ecdc7107e021bcc47e23
+SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.5_GH0/client/pkg/go.mod) = 558
+SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.5_GH0/client/v3/go.mod) = 2b643f78b0c4084877c1cc791b3aa9657d78123c61fe8445819f2d4535efa057
+SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.5_GH0/client/v3/go.mod) = 2035
+SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.5_GH0/etcdctl/go.mod) = ed2c0472d6bdd6991893dd03b3b9cc7280e37849577674a6871299c91403f277
+SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.5_GH0/etcdctl/go.mod) = 2099
+SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.5_GH0/etcdutl/go.mod) = e263702ad79b6647034ec9e80347ea2a8b10f47ef2f6b9b8067ea22155516a9d
+SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.5_GH0/etcdutl/go.mod) = 3995
+SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.5_GH0/server/go.mod) = fa4ea2992e6fbdb3fa1035a15f34c72f433cd6d07a180960c93c0b120f35c667
+SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.5_GH0/server/go.mod) = 3585
+SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.5_GH0/tests/go.mod) = 78bd93a63a0a6af77fa3fce900ddd56aa2ab7d3256d7f049a29084e6f503489e
+SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.5_GH0/tests/go.mod) = 4496
+SHA256 (go/devel_etcd36/etcd-io-etcd-v3.6.5_GH0/etcd-io-etcd-v3.6.5_GH0.tar.gz) = 96b2eabaf6da7dd21797152e7d1c1ce27da75926ae10e08a90b7ed0458287a4b
+SIZE (go/devel_etcd36/etcd-io-etcd-v3.6.5_GH0/etcd-io-etcd-v3.6.5_GH0.tar.gz) = 7376358