diff --git a/metznet/golang.scm b/metznet/golang.scm
index 20af21d..605c137 100644
--- a/metznet/golang.scm
+++ b/metznet/golang.scm
@@ -4,25 +4,171 @@
   #:use-module (gnu packages golang-check)
   #:use-module (guix build download)
   #:use-module (guix git-download)
+  #:use-module (guix memoization)
   #:use-module ((guix licenses)
                 #:prefix license:)
   #:use-module (guix build-system go)
+  #:use-module (guix utils)
+  #:use-module (guix gexp)
 
   #:export (go-gopkg-in-asn1-ber-v1 metznet-pubkey))
 
+(define-public go-1.21
+  (package
+    (inherit go-1.20)
+    (name "go")
+    (version "1.21.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/golang/go")
+             (commit (string-append "go" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0xp1mqjbbs53bjg00d4a37af5p1by28xnflj2xi5kchcpmlqn5nz"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments go-1.20)
+       ;; Source patching phases are broken up into discrete steps to allow
+       ;; future versions to discard individual phases without having to
+       ;; discard all source patching.
+       ((#:phases phases)
+        #~(modify-phases #$phases
+            (replace 'install
+              (lambda* (#:key outputs #:allow-other-keys)
+                ;; Notably, we do not install archives (180M), which Go will
+                ;; happily recompile quickly (and cache) if needed, almost
+                ;; surely faster than they could be substituted.
+                ;;
+                ;; The main motivation for pre-compiled archives is to use
+                ;; libc-linked `net' or `os' packages without a C compiler,
+                ;; but on Guix a C compiler is necessary to properly link the
+                ;; final binaries anyway.  Many build flags also invalidate
+                ;; these pre-compiled archives, so in practice Go often
+                ;; recompiles them anyway.
+                ;;
+                ;; Upstream is also planning to no longer install these
+                ;; archives: <https://github.com/golang/go/issues/47257>
+                ;;
+                ;; When necessary, a custom pre-compiled library package can
+                ;; be created with `#:import-path "std"' and used with
+                ;; `-pkgdir'.
+                ;;
+                ;; When moving files into place, any files that come from
+                ;; GOROOT should remain in GOROOT to continue functioning. If
+                ;; they need to be referenced from some other directory, they
+                ;; need to be symlinked from GOROOT. For more information,
+                ;; please see https://github.com/golang/go/issues/61921
+                (let* ((out (assoc-ref outputs "out"))
+                       (tests (assoc-ref outputs "tests")))
+                  (for-each (lambda (file)
+                              (copy-recursively file
+                                                (string-append out "/lib/go/"
+                                                               file)))
+                            '("bin" "go.env" "lib" "VERSION" "pkg/include"
+                              "pkg/tool"))
+
+                  (symlink "lib/go/bin"
+                           (string-append out "/bin"))
+
+                  (for-each (match-lambda
+                              ((file dest output)
+                               ;; Copy to output/dest and symlink from output/lib/go/file.
+                               (let ((file* (string-append output "/lib/go/"
+                                                           file))
+                                     (dest* (string-append output "/" dest)))
+                                 (copy-recursively file dest*)
+                                 (mkdir-p (dirname file*))
+                                 (symlink (string-append "../../" dest) file*))))
+                            `(("src" "share/go/src"
+                               ,out)
+                              ("misc" "share/go/misc"
+                               ,out)
+                              ("doc" "share/doc/go/doc"
+                               ,out)
+                              ("api" "share/go/api"
+                               ,tests)
+                              ("test" "share/go/test"
+                               ,tests))))))
+            (delete 'skip-TestGoPathShlibGccgo-tests)
+            (delete 'patch-source)
+            (add-after 'unpack 'patch-os-tests
+              (lambda _
+                (substitute* "src/os/os_test.go"
+                  (("/usr/bin")
+                   (getcwd))
+                  (("/bin/sh")
+                   (which "sh")))))
+
+            (add-after 'unpack 'apply-patches
+              (lambda* (#:key inputs #:allow-other-keys)
+                ;; Having the patch in the 'patches' field of <origin> breaks
+                ;; the 'TestServeContent' test due to the fact that
+                ;; timestamps are reset.  Thus, apply it from here.
+                (invoke "patch" "-p1" "--force" "-i"
+                        (assoc-ref inputs "go-fix-script-tests.patch"))))
+
+            (add-after 'unpack 'patch-src/net
+              (lambda* (#:key inputs #:allow-other-keys)
+                (let ((net-base (assoc-ref inputs "net-base")))
+                  (substitute* "src/net/lookup_unix.go"
+                    (("/etc/protocols")
+                     (string-append net-base "/etc/protocols")))
+                  (substitute* "src/net/port_unix.go"
+                    (("/etc/services")
+                     (string-append net-base "/etc/services"))))))
+
+            (add-after 'unpack 'patch-zoneinfo
+              (lambda* (#:key inputs #:allow-other-keys)
+                ;; Add the path to this specific version of tzdata's zoneinfo
+                ;; file to the top of the list to search. We don't want to
+                ;; replace any sources because it will affect how binaries
+                ;; compiled with this Go toolchain behave on non-guix
+                ;; platforms.
+                (substitute* "src/time/zoneinfo_unix.go"
+                  (("var platformZoneSources.+" all)
+                   (format #f "~a~%\"~a/share/zoneinfo\",~%" all
+                           (assoc-ref inputs "tzdata"))))))
+
+            (add-after 'unpack 'patch-cmd/go/testdata/script
+              (lambda _
+                (substitute* "src/cmd/go/testdata/script/cgo_path_space.txt"
+                  (("/bin/sh")
+                   (which "sh")))))
+
+            (add-after 'enable-external-linking 'enable-external-linking-1.21
+              (lambda _
+                ;; Invoke GCC to link any archives created with GCC (that is, any
+                ;; packages built using 'cgo'), because Go doesn't know how to
+                ;; handle the runpaths but GCC does.  Use substitute* rather than
+                ;; a patch since these files are liable to change often.
+                ;;
+                ;; XXX: Replace with GO_EXTLINK_ENABLED=1 or similar when
+                ;; <https://github.com/golang/go/issues/31544> and/or
+                ;; <https://github.com/golang/go/issues/43525> are resolved.
+                (substitute* "src/cmd/link/internal/ld/config.go"
+                  (("\\(iscgo && \\(.+\\)")
+                   "iscgo"))
+                (substitute* "src/internal/testenv/testenv.go"
+                  (("!CanInternalLink.+")
+                   "true {\n"))
+                (substitute* "src/syscall/exec_linux_test.go"
+                  (("testenv.MustHaveExecPath\\(t, \"whoami\"\\)")
+                   "t.Skipf(\"no passwd file present\")"))))))))))
+
 (define-public go-github-com-azure-go-ntlmssp
   (package
     (name "go-github-com-azure-go-ntlmssp")
     (version "0.0.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/Azure/go-ntlmssp.git")
-                    (commit "754e69321358ada85ce213a4ec971d3e4d1bfdf7")))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0dg20fwylf5lpsc5fgnnzw7jxz0885bg97lla1b5wrlhjas6lidn"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/Azure/go-ntlmssp.git")
+             (commit "754e69321358ada85ce213a4ec971d3e4d1bfdf7")))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0dg20fwylf5lpsc5fgnnzw7jxz0885bg97lla1b5wrlhjas6lidn"))))
     (build-system go-build-system)
     (native-inputs `(("go-golang-org-x-crypto" ,go-golang-org-x-crypto)))
     (arguments
@@ -41,15 +187,15 @@ This package only implements authentication, no key exchange or encryption. It o
   (package
     (name "go-github-com-go-asn1-ber")
     (version "1.5.5")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/go-asn1-ber/asn1-ber.git")
-                    (commit "04301b4b1c5ff66221f8f8a394f814a9917d678a")))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1k9yqv963jqwl3i14069pf62il2kjqhg096f6sq55s4qykklpz98"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/go-asn1-ber/asn1-ber.git")
+             (commit "04301b4b1c5ff66221f8f8a394f814a9917d678a")))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1k9yqv963jqwl3i14069pf62il2kjqhg096f6sq55s4qykklpz98"))))
     (build-system go-build-system)
     (arguments
      '(#:import-path "github.com/go-asn1-ber/asn1-ber"))
@@ -64,15 +210,15 @@ This package only implements authentication, no key exchange or encryption. It o
   (package
     (name "go-github-com-go-ldap-ldap")
     (version "3.4.6")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/go-ldap/ldap.git")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "019j58rhkqp3dnn3c9nj7bjc1h52fs7i0lml5gdwhwn837c0aahb"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/go-ldap/ldap.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "019j58rhkqp3dnn3c9nj7bjc1h52fs7i0lml5gdwhwn837c0aahb"))))
     (build-system go-build-system)
     (propagated-inputs `(("go-github-com-azure-go-ntlmssp" ,go-github-com-azure-go-ntlmssp)
                          ("go-golang-org-x-crypto" ,go-golang-org-x-crypto)
@@ -93,15 +239,15 @@ This package only implements authentication, no key exchange or encryption. It o
   (package
     (name "metznet-pubkey")
     (version "1.0.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://git.metznet.ca/metznet/pubkey.git")
-                    (commit (string-append "v" version))))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "1074knwjakwzdlg10xbm0m6qzi4i3bbp452q9b7jm52gbalk3hzb"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://git.metznet.ca/metznet/pubkey.git")
+             (commit (string-append "v" version))))
+       (file-name (string-append name "-" version "-checkout"))
+       (sha256
+        (base32 "1074knwjakwzdlg10xbm0m6qzi4i3bbp452q9b7jm52gbalk3hzb"))))
     (build-system go-build-system)
     (arguments
      `(#:import-path "git.metznet.ca/Metznet/pubkey"))