diff --git a/devel/etcd35/Makefile b/devel/etcd35/Makefile
index edc53f9..22abf84 100644
--- a/devel/etcd35/Makefile
+++ b/devel/etcd35/Makefile
@@ -4,16 +4,16 @@ DISTVERSIONPREFIX=	v
 #PORTREVISION=	25
 CATEGORIES=	devel
 PKGNAMEPREFIX=	coreos-
-PKGNAMESUFFIX=	34
+#PKGNAMESUFFIX=	34
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	kiwi@oav.net
 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
+USES=		cpe go:1.23,modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	coreos
 GH_TUPLE=	\
@@ -26,6 +26,23 @@ GH_TUPLE=	\
 		coreos:go-systemd:v22.3.2:coreos_go_systemd_v22/vendor/github.com/coreos/go-systemd/v22 \
 		dustin:go-humanize:v1.0.0:dustin_go_humanize/vendor/github.com/dustin/go-humanize \
 		etcd-io:bbolt:v1.3.10:etcd_io_bbolt/vendor/go.etcd.io/bbolt \
+		etcd-io:etcd:v3.6.0-alpha.0:etcd_io_etcd/go.etcd.io/etcd/api/v3 \
+		etcd-io:etcd:v3.6.0-alpha.0:etcd_io_etcd_11/go.etcd.io/etcd/etcdutl/v3 \
+		etcd-io:etcd:v3.6.0-alpha.0:etcd_io_etcd_12/go.etcd.io/etcd/pkg/v3 \
+		etcd-io:etcd:v3.6.0-alpha.0:etcd_io_etcd_14/go.etcd.io/etcd/raft/v3 \
+		etcd-io:etcd:v3.6.0-alpha.0:etcd_io_etcd_17/go.etcd.io/etcd/server/v3 \
+		etcd-io:etcd:v3.6.0-alpha.0:etcd_io_etcd_2/go.etcd.io/etcd/client/pkg/v3 \
+		etcd-io:etcd:v3.6.0-alpha.0:etcd_io_etcd_6/go.etcd.io/etcd/client/v3 \
+		etcd-io:etcd:v3.6.0-alpha.0:etcd_io_etcd_8/go.etcd.io/etcd/etcdctl/v3 \
+		etcd-io:etcd:v3.5.15:etcd_io_etcd_10 \
+		etcd-io:etcd:v3.5.15:etcd_io_etcd_13 \
+		etcd-io:etcd:v3.5.15:etcd_io_etcd_15 \
+		etcd-io:etcd:v3.5.15:etcd_io_etcd_16 \
+		etcd-io:etcd:v3.5.15:etcd_io_etcd_19 \
+		etcd-io:etcd:v3.5.15:etcd_io_etcd_1 \
+		etcd-io:etcd:v3.5.15:etcd_io_etcd_3 \
+		etcd-io:etcd:v3.5.15:etcd_io_etcd_7 \
+		etcd-io:etcd:v3.5.15:etcd_io_etcd_9 \
 		go-logr:logr:v1.3.0:go_logr_logr/vendor/github.com/go-logr/logr \
 		go-logr:stdr:v1.2.2:go_logr_stdr/vendor/github.com/go-logr/stdr \
 		go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
@@ -75,6 +92,10 @@ GH_TUPLE=	\
 		uber-go:zap:v1.17.0:uber_go_zap/vendor/go.uber.org/zap \
 		xiang90:probing:43a291ad63a2:xiang90_probing/vendor/github.com/xiang90/probing
 
+		#etcd-io:etcd:v3.0.0-00010101000000-000000000000:etcd_io_etcd_18/go.etcd.io/etcd/tests/v3 \
+		#etcd-io:etcd:v2.306.0-alpha.0:etcd_io_etcd_4/go.etcd.io/etcd/client/v2 \
+		#etcd-io:etcd:v2.305.15:etcd_io_etcd_5 \
+
 GO_PKGNAME=	github.com/coreos/etcd
 GO_TARGET=	./server ./etcdctl ./etcdutl
 
@@ -87,35 +108,35 @@ 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
+#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
+
+post-extract:
+	@${RLN} ${WRKSRC_etcd_io_etcd_1} ${WRKSRC}/api
+	@${RLN} ${WRKSRC_etcd_io_etcd} ${WRKSRC}/api
+	@${RLN} ${WRKSRC_etcd_io_etcd_3} ${WRKSRC}/client/pkg
+	@${RLN} ${WRKSRC_etcd_io_etcd_2} ${WRKSRC}/client/pkg
+	@${RLN} ${WRKSRC_etcd_io_etcd_4} ${WRKSRC}/client/v2
+	@${RLN} ${WRKSRC_etcd_io_etcd_5} ${WRKSRC}/client/v2
+	@${RLN} ${WRKSRC_etcd_io_etcd_7} ${WRKSRC}/client/v3
+	@${RLN} ${WRKSRC_etcd_io_etcd_6} ${WRKSRC}/client/v3
+	@${RLN} ${WRKSRC_etcd_io_etcd_9} ${WRKSRC}/etcdctl
+	@${RLN} ${WRKSRC_etcd_io_etcd_8} ${WRKSRC}/etcdctl
+	@${RLN} ${WRKSRC_etcd_io_etcd_11} ${WRKSRC}/etcdutl
+	@${RLN} ${WRKSRC_etcd_io_etcd_10} ${WRKSRC}/etcdutl
+	@${RLN} ${WRKSRC_etcd_io_etcd_13} ${WRKSRC}/pkg
+	@${RLN} ${WRKSRC_etcd_io_etcd_12} ${WRKSRC}/pkg
+	@${RLN} ${WRKSRC_etcd_io_etcd_15} ${WRKSRC}/raft
+	@${RLN} ${WRKSRC_etcd_io_etcd_14} ${WRKSRC}/raft
+	@${RLN} ${WRKSRC_etcd_io_etcd_16} ${WRKSRC}/server
+	@${RLN} ${WRKSRC_etcd_io_etcd_17} ${WRKSRC}/server
+	@${RLN} ${WRKSRC_etcd_io_etcd_18} ${WRKSRC}/tests
+	@${RLN} ${WRKSRC_etcd_io_etcd_19} ${WRKSRC}/tests
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
-#post-extract:
-#	@${RLN} ${WRKSRC_etcd_io_etcd_1} ${WRKSRC}/api
-#	@${RLN} ${WRKSRC_etcd_io_etcd} ${WRKSRC}/api
-#	@${RLN} ${WRKSRC_etcd_io_etcd_3} ${WRKSRC}/client/pkg
-#	@${RLN} ${WRKSRC_etcd_io_etcd_2} ${WRKSRC}/client/pkg
-#	@${RLN} ${WRKSRC_etcd_io_etcd_4} ${WRKSRC}/client/v2
-#	@${RLN} ${WRKSRC_etcd_io_etcd_5} ${WRKSRC}/client/v2
-#	@${RLN} ${WRKSRC_etcd_io_etcd_7} ${WRKSRC}/client/v3
-#	@${RLN} ${WRKSRC_etcd_io_etcd_6} ${WRKSRC}/client/v3
-#	@${RLN} ${WRKSRC_etcd_io_etcd_9} ${WRKSRC}/etcdctl
-#	@${RLN} ${WRKSRC_etcd_io_etcd_8} ${WRKSRC}/etcdctl
-#	@${RLN} ${WRKSRC_etcd_io_etcd_11} ${WRKSRC}/etcdutl
-#	@${RLN} ${WRKSRC_etcd_io_etcd_10} ${WRKSRC}/etcdutl
-#	@${RLN} ${WRKSRC_etcd_io_etcd_13} ${WRKSRC}/pkg
-#	@${RLN} ${WRKSRC_etcd_io_etcd_12} ${WRKSRC}/pkg
-#	@${RLN} ${WRKSRC_etcd_io_etcd_15} ${WRKSRC}/raft
-#	@${RLN} ${WRKSRC_etcd_io_etcd_14} ${WRKSRC}/raft
-#	@${RLN} ${WRKSRC_etcd_io_etcd_16} ${WRKSRC}/server
-#	@${RLN} ${WRKSRC_etcd_io_etcd_17} ${WRKSRC}/server
-#	@${RLN} ${WRKSRC_etcd_io_etcd_18} ${WRKSRC}/tests
-#	@${RLN} ${WRKSRC_etcd_io_etcd_19} ${WRKSRC}/tests
-
 .include <bsd.port.mk>
diff --git a/devel/etcd35/distinfo b/devel/etcd35/distinfo
index b61c7c5..97be694 100644
--- a/devel/etcd35/distinfo
+++ b/devel/etcd35/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1729522799
+TIMESTAMP = 1729604076
 SHA256 (coreos-etcd-v3.5.15_GH0.tar.gz) = bfc9c90f103acd47b0dca2840d4b69af68cb39f22893bef0f4fb5c5351314b84
 SIZE (coreos-etcd-v3.5.15_GH0.tar.gz) = 4113649
 SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
@@ -19,6 +19,40 @@ SHA256 (dustin-go-humanize-v1.0.0_GH0.tar.gz) = e4540bd50ac855143b4f2e509313079c
 SIZE (dustin-go-humanize-v1.0.0_GH0.tar.gz) = 17260
 SHA256 (etcd-io-bbolt-v1.3.10_GH0.tar.gz) = 4991a0f2cfb4fd4530c450e3b913cf38fc8566d115c514ecbcef5946a7391400
 SIZE (etcd-io-bbolt-v1.3.10_GH0.tar.gz) = 125701
+SHA256 (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = c101da7821e89ab59f47606b083407462e3ff67fa5d37e161574a1c42b688254
+SIZE (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = 4161362
+SHA256 (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = c101da7821e89ab59f47606b083407462e3ff67fa5d37e161574a1c42b688254
+SIZE (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = 4161362
+SHA256 (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = c101da7821e89ab59f47606b083407462e3ff67fa5d37e161574a1c42b688254
+SIZE (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = 4161362
+SHA256 (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = c101da7821e89ab59f47606b083407462e3ff67fa5d37e161574a1c42b688254
+SIZE (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = 4161362
+SHA256 (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = c101da7821e89ab59f47606b083407462e3ff67fa5d37e161574a1c42b688254
+SIZE (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = 4161362
+SHA256 (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = c101da7821e89ab59f47606b083407462e3ff67fa5d37e161574a1c42b688254
+SIZE (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = 4161362
+SHA256 (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = c101da7821e89ab59f47606b083407462e3ff67fa5d37e161574a1c42b688254
+SIZE (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = 4161362
+SHA256 (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = c101da7821e89ab59f47606b083407462e3ff67fa5d37e161574a1c42b688254
+SIZE (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = 4161362
+SHA256 (etcd-io-etcd-v3.5.15_GH0.tar.gz) = bfc9c90f103acd47b0dca2840d4b69af68cb39f22893bef0f4fb5c5351314b84
+SIZE (etcd-io-etcd-v3.5.15_GH0.tar.gz) = 4113649
+SHA256 (etcd-io-etcd-v3.5.15_GH0.tar.gz) = bfc9c90f103acd47b0dca2840d4b69af68cb39f22893bef0f4fb5c5351314b84
+SIZE (etcd-io-etcd-v3.5.15_GH0.tar.gz) = 4113649
+SHA256 (etcd-io-etcd-v3.5.15_GH0.tar.gz) = bfc9c90f103acd47b0dca2840d4b69af68cb39f22893bef0f4fb5c5351314b84
+SIZE (etcd-io-etcd-v3.5.15_GH0.tar.gz) = 4113649
+SHA256 (etcd-io-etcd-v3.5.15_GH0.tar.gz) = bfc9c90f103acd47b0dca2840d4b69af68cb39f22893bef0f4fb5c5351314b84
+SIZE (etcd-io-etcd-v3.5.15_GH0.tar.gz) = 4113649
+SHA256 (etcd-io-etcd-v3.5.15_GH0.tar.gz) = bfc9c90f103acd47b0dca2840d4b69af68cb39f22893bef0f4fb5c5351314b84
+SIZE (etcd-io-etcd-v3.5.15_GH0.tar.gz) = 4113649
+SHA256 (etcd-io-etcd-v3.5.15_GH0.tar.gz) = bfc9c90f103acd47b0dca2840d4b69af68cb39f22893bef0f4fb5c5351314b84
+SIZE (etcd-io-etcd-v3.5.15_GH0.tar.gz) = 4113649
+SHA256 (etcd-io-etcd-v3.5.15_GH0.tar.gz) = bfc9c90f103acd47b0dca2840d4b69af68cb39f22893bef0f4fb5c5351314b84
+SIZE (etcd-io-etcd-v3.5.15_GH0.tar.gz) = 4113649
+SHA256 (etcd-io-etcd-v3.5.15_GH0.tar.gz) = bfc9c90f103acd47b0dca2840d4b69af68cb39f22893bef0f4fb5c5351314b84
+SIZE (etcd-io-etcd-v3.5.15_GH0.tar.gz) = 4113649
+SHA256 (etcd-io-etcd-v3.5.15_GH0.tar.gz) = bfc9c90f103acd47b0dca2840d4b69af68cb39f22893bef0f4fb5c5351314b84
+SIZE (etcd-io-etcd-v3.5.15_GH0.tar.gz) = 4113649
 SHA256 (go-logr-logr-v1.3.0_GH0.tar.gz) = a0ceb13b9611e19ebe3cba015e2e6dbbf3125be9cd7f1d975d4d334da688839a
 SIZE (go-logr-logr-v1.3.0_GH0.tar.gz) = 51225
 SHA256 (go-logr-stdr-v1.2.2_GH0.tar.gz) = 37d975b280d884ca0d55a800bc6e47314b6e86268e56254f9d15d19ca9404eb8