diff --git a/devel/go-tools/Makefile b/devel/go-tools/Makefile
index e60e7b1424dd..a1c13cb46cad 100644
--- a/devel/go-tools/Makefile
+++ b/devel/go-tools/Makefile
@@ -1,61 +1,60 @@
 PORTNAME=	tools
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.1.12
-PORTREVISION=	3
+DISTVERSION=	0.2.0
 PORTEPOCH=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	go-
 
 MAINTAINER=	fuz@fuz.su
 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/bundle \
 		./cmd/callgraph \
 		./cmd/compilebench \
 		./cmd/cover \
 		./cmd/digraph \
 		./cmd/eg \
 		./cmd/file2fuzz \
 		./cmd/fiximports \
 		./cmd/go-contrib-init \
 		./cmd/godex \
 		./cmd/godoc \
 		./cmd/goimports \
 		./cmd/gomvpkg \
 		./cmd/gorename \
 		./cmd/gotype \
 		./cmd/goyacc \
 		./cmd/guru \
 		./cmd/html2article \
 		./cmd/present \
 		./cmd/present2md \
 		./cmd/signature-fuzzer/fuzz-driver \
 		./cmd/signature-fuzzer/fuzz-runner \
 		./cmd/ssadump \
 		./cmd/stress \
 		./cmd/stringer \
 		./cmd/toolstash
 
 CONFLICTS_INSTALL=	easygit p5-Devel-Cover 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 \
 		./cmd/getgo \
 		./cmd/getgo/server \
 		./cmd/splitdwarf"
 
 .include <bsd.port.mk>
diff --git a/devel/go-tools/distinfo b/devel/go-tools/distinfo
index b70bbf92b455..a6e1879e293a 100644
--- a/devel/go-tools/distinfo
+++ b/devel/go-tools/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1659036915
-SHA256 (go/devel_go-tools/tools-v0.1.12/v0.1.12.mod) = 2a8b9365898f0822face65ba089a1353e68a65d342f300ca317cceccde6421f3
-SIZE (go/devel_go-tools/tools-v0.1.12/v0.1.12.mod) = 327
-SHA256 (go/devel_go-tools/tools-v0.1.12/v0.1.12.zip) = 4b122e0e4703bc4014cb1cf8c014fcf93ea7d72f01da79499365346f54cbb851
-SIZE (go/devel_go-tools/tools-v0.1.12/v0.1.12.zip) = 3946738
+TIMESTAMP = 1666640091
+SHA256 (go/devel_go-tools/tools-v0.2.0/v0.2.0.mod) = 9c9b5e62af69f2b10029ce12944dc8834f1226a83bb243e9a0dbf37e0bb186ba
+SIZE (go/devel_go-tools/tools-v0.2.0/v0.2.0.mod) = 177
+SHA256 (go/devel_go-tools/tools-v0.2.0/v0.2.0.zip) = 05da23611d775b2d3771438fa2e5e522cc948a35372cb7ad019fe484f1e91ae0
+SIZE (go/devel_go-tools/tools-v0.2.0/v0.2.0.zip) = 2935954
diff --git a/devel/go-tools/pkg-descr b/devel/go-tools/pkg-descr
index 65ebf473304f..28f75c9ea80a 100644
--- a/devel/go-tools/pkg-descr
+++ b/devel/go-tools/pkg-descr
@@ -1,2 +1,20 @@
-This port holds the source for various packages and tools that support the Go
-programming language.
+go-tools holds the golang.org/x/tools module, comprising various tools
+mostly for static analysis of Go programs, some of which are listed
+below.  Selected commands:
+
+goimports  formats a Go program like go fmt and additionally inserts
+	import statements for any packages required by the file after it
+	is edited.
+
+callgraph  prints the call graph of a Go program.
+
+
+digraph  is a utility for manipulating directed graphs in textual
+	notation.
+
+
+stringer  generates declarations (including a String method) for "enum"
+	types.
+
+toolstash is a utility to simplify working with multiple versions of the
+	Go toolchain.