diff --git a/devel/go-tools/Makefile b/devel/go-tools/Makefile
index ac2f535e1a09..fa64d360f9d3 100644
--- a/devel/go-tools/Makefile
+++ b/devel/go-tools/Makefile
@@ -1,30 +1,53 @@
 # Created by: Carlo Strub <cs@FreeBSD.org>
 
 PORTNAME=	tools
-DISTVERSION=	20180726
-PORTREVISION=	1
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.1.8
+PORTEPOCH=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	go-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	fuz@fuz.su
 COMMENT=	Go Tools
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		go
+USES=		go:modules
 
-USE_GITHUB=	yes
-GH_TUPLE=	golang:tools:bfb5194:DEFAULT \
-		golang:crypto:3cb0727:crypto/vendor/golang.org/x/crypto \
-		golang:net:b6d7b13:net/vendor/golang.org/x/net
+GO_MODULE=	golang.org/x/tools
+GO_TARGET=	./cmd/auth/authtest \
+		./cmd/auth/cookieauth \
+		./cmd/auth/gitauth \
+		./cmd/auth/netrcauth \
+		./cmd/benchcmp \
+		./cmd/bundle \
+		./cmd/callgraph \
+		./cmd/compilebench \
+		./cmd/cover \
+		./cmd/digraph \
+		./cmd/eg \
+		./cmd/file2fuzz \
+		./cmd/fiximports \
+		./cmd/getgo \
+		./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/splitdwarf \
+		./cmd/ssadump \
+		./cmd/stress \
+		./cmd/stringer \
+		./cmd/toolstash
 
-GO_PKGNAME=	golang.org/x/tools
-GO_TARGET=	./cmd/benchcmp ./cmd/bundle ./cmd/callgraph ./cmd/compilebench \
-		./cmd/cover ./cmd/digraph ./cmd/eg ./cmd/fiximports ./cmd/getgo \
-		./cmd/go-contrib-init ./cmd/godex ./cmd/godoc ./cmd/goimports \
-		./cmd/gomvpkg ./cmd/gorename ./cmd/gotype ./cmd/goyacc ./cmd/guru \
-		./cmd/heapview ./cmd/html2article ./cmd/present ./cmd/ssadump \
-		./cmd/stress ./cmd/stringer ./cmd/tip ./cmd/toolstash
+PLIST_FILES=	${GO_TARGET:T:S,^,bin/,}
 
 .include <bsd.port.mk>
diff --git a/devel/go-tools/distinfo b/devel/go-tools/distinfo
index 92a379922a81..63c553fb4d2d 100644
--- a/devel/go-tools/distinfo
+++ b/devel/go-tools/distinfo
@@ -1,7 +1,5 @@
-TIMESTAMP = 1532699975
-SHA256 (golang-tools-20180726-bfb5194_GH0.tar.gz) = 533a034e94aade0b4e61197dd9cb29e230944224fb20b5afe88b46e8701376a0
-SIZE (golang-tools-20180726-bfb5194_GH0.tar.gz) = 2314123
-SHA256 (golang-crypto-3cb0727_GH0.tar.gz) = eef75f6cbd2cb14d1c0a4561acde19d725808cc2338d440b54d91b9befc07d46
-SIZE (golang-crypto-3cb0727_GH0.tar.gz) = 1318217
-SHA256 (golang-net-b6d7b13_GH0.tar.gz) = fed6d62b1aee0d44726739836ef4164ca268ad1343b868e8d42dc5c7285a7898
-SIZE (golang-net-b6d7b13_GH0.tar.gz) = 740584
+TIMESTAMP = 1638797804
+SHA256 (go/devel_go-tools/tools-v0.1.8/v0.1.8.mod) = 123a6090da3da25fbd14981e3671d2eb06a01b4a9fd693957580e50989f5ecfa
+SIZE (go/devel_go-tools/tools-v0.1.8/v0.1.8.mod) = 349
+SHA256 (go/devel_go-tools/tools-v0.1.8/v0.1.8.zip) = 5dbbf48a243ec742c48b5cc37a84678307764c8b3cfb3f6133f4ac54800cf89f
+SIZE (go/devel_go-tools/tools-v0.1.8/v0.1.8.zip) = 3657159
diff --git a/devel/go-tools/pkg-plist b/devel/go-tools/pkg-plist
deleted file mode 100644
index 8bf2a983e985..000000000000
--- a/devel/go-tools/pkg-plist
+++ /dev/null
@@ -1,26 +0,0 @@
-bin/benchcmp
-bin/bundle
-bin/callgraph
-bin/compilebench
-bin/cover
-bin/digraph
-bin/eg
-bin/fiximports
-bin/getgo
-bin/go-contrib-init
-bin/godex
-bin/godoc
-bin/goimports
-bin/gomvpkg
-bin/gorename
-bin/gotype
-bin/goyacc
-bin/guru
-bin/heapview
-bin/html2article
-bin/present
-bin/ssadump
-bin/stress
-bin/stringer
-bin/tip
-bin/toolstash