diff --git a/devel/go-tools/Makefile b/devel/go-tools/Makefile
index 5de69629afdf..79e1e109e93d 100644
--- a/devel/go-tools/Makefile
+++ b/devel/go-tools/Makefile
@@ -1,60 +1,59 @@
 PORTNAME=	tools
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.20.0
-PORTREVISION=	2
+DISTVERSION=	0.21.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
 GO_MODULE=	golang.org/x/tools
 GO_TARGET=	./cmd/auth/cookieauth \
 		./cmd/auth/gitauth \
 		./cmd/auth/netrcauth \
 		./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/gorename \
 		./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/auth/authtest \
 		./cmd/benchcmp
 
 .include <bsd.port.mk>
diff --git a/devel/go-tools/distinfo b/devel/go-tools/distinfo
index b68786b9ff31..35095a8640ae 100644
--- a/devel/go-tools/distinfo
+++ b/devel/go-tools/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1712310965
-SHA256 (go/devel_go-tools/tools-v0.20.0/v0.20.0.mod) = 79697f2d515d81d53deefa0d23aa941edb93dd2c4a5c21c299d43206841a51d9
-SIZE (go/devel_go-tools/tools-v0.20.0/v0.20.0.mod) = 278
-SHA256 (go/devel_go-tools/tools-v0.20.0/v0.20.0.zip) = f9537c85fc51e59299b627c842381f97cabde123f9fc40a0da51eec0d637dbd9
-SIZE (go/devel_go-tools/tools-v0.20.0/v0.20.0.zip) = 3138024
+TIMESTAMP = 1715097024
+SHA256 (go/devel_go-tools/tools-v0.21.0/v0.21.0.mod) = 4525dad4f5723d1e409f6a398c1ae7fd5e2c637d43a5caeb49844077b91c9eeb
+SIZE (go/devel_go-tools/tools-v0.21.0/v0.21.0.mod) = 339
+SHA256 (go/devel_go-tools/tools-v0.21.0/v0.21.0.zip) = 1099b286fba466d61da042e950e7da3cc0373260e95fe116bf61cfb6ec4828a8
+SIZE (go/devel_go-tools/tools-v0.21.0/v0.21.0.zip) = 3151802