diff --git a/lib/const.rb b/lib/const.rb
index 0ec9bd9cb..11e8cd92c 100644
--- a/lib/const.rb
+++ b/lib/const.rb
@@ -4,7 +4,7 @@ require 'etc'
 require 'open3'
 
 OLD_CREW_VERSION ||= defined?(CREW_VERSION) ? CREW_VERSION : '1.0'
-CREW_VERSION ||= '1.65.7' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION
+CREW_VERSION ||= '1.65.8' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION
 
 # Kernel architecture.
 KERN_ARCH ||= Etc.uname[:machine]
@@ -189,6 +189,7 @@ unless defined?(CREW_ANITYA_PACKAGE_NAME_MAPPINGS)
     { pkg_name: 'asdf', anitya_pkg: 'asdf-vm', comments: '' },
     { pkg_name: 'cf', anitya_pkg: 'cf', comments: 'Prefer to Github' },
     { pkg_name: 'cvs', anitya_pkg: 'cvs-stable', comments: '' },
+    { pkg_name: 'go_tools', anitya_pkg: 'golang-x-tools', comments: '' },
     { pkg_name: 'gtk4', anitya_pkg: 'gtk', comments: '' },
     { pkg_name: 'gvim', anitya_pkg: 'vim', comments: '' },
     { pkg_name: 'py3_atspi', anitya_pkg: 'pyatspi', comments: '' },
diff --git a/manifest/armv7l/g/go.filelist b/manifest/armv7l/g/go.filelist
index e333ffbf9..ddc99ab4b 100644
--- a/manifest/armv7l/g/go.filelist
+++ b/manifest/armv7l/g/go.filelist
@@ -1,3 +1,4 @@
+# Total size: 203296397
 /usr/local/bin/go
 /usr/local/bin/gofmt
 /usr/local/share/go/CONTRIBUTING.md
diff --git a/manifest/armv7l/g/go_tools.filelist b/manifest/armv7l/g/go_tools.filelist
index b08a274b1..35dff8640 100644
--- a/manifest/armv7l/g/go_tools.filelist
+++ b/manifest/armv7l/g/go_tools.filelist
@@ -1,30 +1,27 @@
-# Total size: 152851703
-/usr/local/bin/authtest
+# Total size: 122464212
 /usr/local/bin/benchcmp
-/usr/local/bin/bundle
+/usr/local/bin/bisect
 /usr/local/bin/callgraph
 /usr/local/bin/compilebench
-/usr/local/bin/cookieauth
-/usr/local/bin/cover
+/usr/local/bin/deadcode
 /usr/local/bin/digraph
 /usr/local/bin/eg
+/usr/local/bin/file2fuzz
 /usr/local/bin/fiximports
-/usr/local/bin/getgo
-/usr/local/bin/gitauth
+/usr/local/bin/fuzz-driver
+/usr/local/bin/fuzz-runner
 /usr/local/bin/go-contrib-init
+/usr/local/bin/go_bundle
 /usr/local/bin/godex
 /usr/local/bin/godoc
 /usr/local/bin/goimports
 /usr/local/bin/gomvpkg
-/usr/local/bin/gorename
+/usr/local/bin/gonew
 /usr/local/bin/gotype
 /usr/local/bin/goyacc
-/usr/local/bin/guru
 /usr/local/bin/html2article
-/usr/local/bin/netrcauth
 /usr/local/bin/present
 /usr/local/bin/present2md
-/usr/local/bin/server
 /usr/local/bin/splitdwarf
 /usr/local/bin/ssadump
 /usr/local/bin/stress
diff --git a/manifest/i686/g/go.filelist b/manifest/i686/g/go.filelist
index 7871a68f6..223d97ad3 100644
--- a/manifest/i686/g/go.filelist
+++ b/manifest/i686/g/go.filelist
@@ -1,3 +1,4 @@
+# Total size: 201509718
 /usr/local/bin/go
 /usr/local/bin/gofmt
 /usr/local/share/go/CONTRIBUTING.md
diff --git a/manifest/i686/g/go_tools.filelist b/manifest/i686/g/go_tools.filelist
index 2740a8267..cd3ce74f9 100644
--- a/manifest/i686/g/go_tools.filelist
+++ b/manifest/i686/g/go_tools.filelist
@@ -1,30 +1,27 @@
-# Total size: 152744165
-/usr/local/bin/authtest
+# Total size: 118956180
 /usr/local/bin/benchcmp
-/usr/local/bin/bundle
+/usr/local/bin/bisect
 /usr/local/bin/callgraph
 /usr/local/bin/compilebench
-/usr/local/bin/cookieauth
-/usr/local/bin/cover
+/usr/local/bin/deadcode
 /usr/local/bin/digraph
 /usr/local/bin/eg
+/usr/local/bin/file2fuzz
 /usr/local/bin/fiximports
-/usr/local/bin/getgo
-/usr/local/bin/gitauth
+/usr/local/bin/fuzz-driver
+/usr/local/bin/fuzz-runner
 /usr/local/bin/go-contrib-init
+/usr/local/bin/go_bundle
 /usr/local/bin/godex
 /usr/local/bin/godoc
 /usr/local/bin/goimports
 /usr/local/bin/gomvpkg
-/usr/local/bin/gorename
+/usr/local/bin/gonew
 /usr/local/bin/gotype
 /usr/local/bin/goyacc
-/usr/local/bin/guru
 /usr/local/bin/html2article
-/usr/local/bin/netrcauth
 /usr/local/bin/present
 /usr/local/bin/present2md
-/usr/local/bin/server
 /usr/local/bin/splitdwarf
 /usr/local/bin/ssadump
 /usr/local/bin/stress
diff --git a/manifest/x86_64/g/go.filelist b/manifest/x86_64/g/go.filelist
index 85b72aa14..ded6425b5 100644
--- a/manifest/x86_64/g/go.filelist
+++ b/manifest/x86_64/g/go.filelist
@@ -1,3 +1,4 @@
+# Total size: 205619001
 /usr/local/bin/go
 /usr/local/bin/gofmt
 /usr/local/share/go/CONTRIBUTING.md
diff --git a/manifest/x86_64/g/go_tools.filelist b/manifest/x86_64/g/go_tools.filelist
index 7ace33140..cb04bf0cd 100644
--- a/manifest/x86_64/g/go_tools.filelist
+++ b/manifest/x86_64/g/go_tools.filelist
@@ -1,30 +1,27 @@
-# Total size: 171467993
-/usr/local/bin/authtest
+# Total size: 126407776
 /usr/local/bin/benchcmp
-/usr/local/bin/bundle
+/usr/local/bin/bisect
 /usr/local/bin/callgraph
 /usr/local/bin/compilebench
-/usr/local/bin/cookieauth
-/usr/local/bin/cover
+/usr/local/bin/deadcode
 /usr/local/bin/digraph
 /usr/local/bin/eg
+/usr/local/bin/file2fuzz
 /usr/local/bin/fiximports
-/usr/local/bin/getgo
-/usr/local/bin/gitauth
+/usr/local/bin/fuzz-driver
+/usr/local/bin/fuzz-runner
 /usr/local/bin/go-contrib-init
+/usr/local/bin/go_bundle
 /usr/local/bin/godex
 /usr/local/bin/godoc
 /usr/local/bin/goimports
 /usr/local/bin/gomvpkg
-/usr/local/bin/gorename
+/usr/local/bin/gonew
 /usr/local/bin/gotype
 /usr/local/bin/goyacc
-/usr/local/bin/guru
 /usr/local/bin/html2article
-/usr/local/bin/netrcauth
 /usr/local/bin/present
 /usr/local/bin/present2md
-/usr/local/bin/server
 /usr/local/bin/splitdwarf
 /usr/local/bin/ssadump
 /usr/local/bin/stress
diff --git a/packages/go_tools.rb b/packages/go_tools.rb
index 8522db6d4..c976c51ea 100644
--- a/packages/go_tools.rb
+++ b/packages/go_tools.rb
@@ -3,33 +3,25 @@ require 'package'
 class Go_tools < Package
   description 'Developer tools for the Go programming language'
   homepage 'https://github.com/golang/tools'
-  version '0.6.6'
+  version '0.36.0'
   license 'BSD'
   compatibility 'all'
-  source_url 'SKIP'
-  binary_compression 'tar.xz'
+  source_url 'https://github.com/golang/tools.git'
+  git_hashtag "v#{version}"
+  binary_compression 'tar.zst'
 
   binary_sha256({
-    aarch64: '5c938388e815f2d03343301f391640a1cbc11fac3b31e20fc74b77c0963723df',
-     armv7l: '5c938388e815f2d03343301f391640a1cbc11fac3b31e20fc74b77c0963723df',
-       i686: '02e41321fa7030598a80a396887289027889ad08784bf04c68f38196f33f02ec',
-     x86_64: '61c25f3eae11e32d625f917f8d853e134a24581a555b5edd47e76fcef96f565d'
+    aarch64: '489f8887e565982acc7101addfd275ca6c4cbd8fedee0ce400f8f9823f9ab0f3',
+     armv7l: '489f8887e565982acc7101addfd275ca6c4cbd8fedee0ce400f8f9823f9ab0f3',
+       i686: '2823d076fdbcca9ad38a463f7024bffc7f61db0bd91d91ee884ded61f7591137',
+     x86_64: '9436c12f13b3b60f1b3897434b923d944a4709b4855256060379a206656407b8'
   })
 
+  depends_on 'glibc' # R
   depends_on 'go' => :build
 
   def self.install
-    @git_dir = 'go_tools_git'
-    @git_hash = "gopls/v#{version}"
-    @git_url = 'https://github.com/golang/tools/'
-    FileUtils.rm_rf(@git_dir)
-    FileUtils.mkdir_p(@git_dir)
-    Dir.chdir @git_dir do
-      system 'git init'
-      system "git remote add origin #{@git_url}"
-      system "git fetch --depth 1 origin #{@git_hash}"
-      system 'git checkout FETCH_HEAD'
-      system "GOBIN=#{CREW_DEST_PREFIX}/bin go install ./cmd..."
-    end
+    system "GOBIN=#{CREW_DEST_PREFIX}/bin go install ./cmd..."
+    FileUtils.mv "#{CREW_DEST_PREFIX}/bin/bundle", "#{CREW_DEST_PREFIX}/bin/go_bundle"
   end
 end