diff --git a/devel/go-tools/Makefile b/devel/go-tools/Makefile
index 239476671c81..2873151c5eb5 100644
--- a/devel/go-tools/Makefile
+++ b/devel/go-tools/Makefile
@@ -1,55 +1,54 @@
 PORTNAME=	tools
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.34.0
-PORTREVISION=	1
+DISTVERSION=	0.36.0
 PORTEPOCH=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	go-
 
 MAINTAINER=	fuz@FreeBSD.org
 COMMENT=	Go Tools
 WWW=		https://godoc.org/golang.org/x/tools
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules,1.23
 GO_MODULE=	golang.org/x/tools
 GO_TARGET=	./cmd/bisect \
 		./cmd/bundle \
 		./cmd/callgraph \
 		./cmd/compilebench \
 		./cmd/deadcode \
 		./cmd/digraph \
 		./cmd/eg \
 		./cmd/file2fuzz \
 		./cmd/fiximports \
 		./cmd/go-contrib-init \
 		./cmd/godex \
 		./cmd/godoc \
 		./cmd/goimports \
 		./cmd/gomvpkg \
 		./cmd/gonew \
 		./cmd/gotype \
 		./cmd/goyacc \
 		./cmd/html2article \
 		./cmd/present \
 		./cmd/present2md \
 		./cmd/signature-fuzzer/fuzz-driver \
 		./cmd/signature-fuzzer/fuzz-runner \
 		./cmd/splitdwarf \
 		./cmd/ssadump \
 		./cmd/stress \
 		./cmd/stringer \
 		./cmd/toolstash
 
 CONFLICTS_INSTALL=	easygit rubygem-bundler
 
 PLIST_FILES=	${GO_TARGET:T:S,^,bin/,}
 
 OPTIONS_DEFINE=	RARE
 RARE_DESC=	install rarely used tools
 RARE_VARS=	GO_TARGET+=" \
 		./cmd/benchcmp
 
 .include <bsd.port.mk>
diff --git a/devel/go-tools/distinfo b/devel/go-tools/distinfo
index c38e501f1854..bc3e44600942 100644
--- a/devel/go-tools/distinfo
+++ b/devel/go-tools/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1749214669
-SHA256 (go/devel_go-tools/tools-v0.34.0/v0.34.0.mod) = 5be696f88fba87769d3912f87af6e800858e85ba4b3b0b599870926492114a9e
-SIZE (go/devel_go-tools/tools-v0.34.0/v0.34.0.mod) = 301
-SHA256 (go/devel_go-tools/tools-v0.34.0/v0.34.0.zip) = 3c6b7e5a2a7cc47b1f354c097881d0bd11dc13457d57d5ff86b2469acbd5f846
-SIZE (go/devel_go-tools/tools-v0.34.0/v0.34.0.zip) = 3565684
+TIMESTAMP = 1755157007
+SHA256 (go/devel_go-tools/tools-v0.36.0/v0.36.0.mod) = 53792e623827ef40be8f1af36dcf12790e82780b3d33b4b0944f56a3584bc429
+SIZE (go/devel_go-tools/tools-v0.36.0/v0.36.0.mod) = 301
+SHA256 (go/devel_go-tools/tools-v0.36.0/v0.36.0.zip) = 85b486030e995cd5b4d56dea92f247b32bf4e0ae2fe6816b29d4514b5a43fec8
+SIZE (go/devel_go-tools/tools-v0.36.0/v0.36.0.zip) = 3553586