diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 57829585f5..d87080d17f 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4361,8 +4361,8 @@ platforms.  Gox will also build the cross-compilation toolchain for you.")
        ("go-github-com-godbus-dbus" ,go-github-com-godbus-dbus)
        ("go-github-com-go-libsecret" ,go-github-com-go-libsecret)
        ("go-github-com-mitchellh-go-homedir" ,go-github-com-mitchellh-go-homedir)
-       ("go-golang-org-x-crypto-ssh-terminal" ,go-golang-org-x-crypto-ssh-terminal)
-       ("go-golang-org-x-sys-unix" ,go-golang-org-x-sys-unix)
+       ("go-golang-org-x-crypto" ,go-golang-org-x-crypto)
+       ("go-golang-org-x-sys" ,go-golang-org-x-sys)
        ("go-github-com-go-ini-ini" ,go-github-com-go-ini-ini)
        ("go-github-com-skratchdot-open-golang" ,go-github-com-skratchdot-open-golang)
        ("go-gopkg-in-kingpin-v2" ,go-gopkg-in-kingpin-v2)
@@ -4386,7 +4386,7 @@ aware of your profiles and configuration in ~/.aws/config.")
 (define-public go-keyring
   (package
     (name "go-keyring")
-    (version "1.0.0")
+    (version "v1.0.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -4398,8 +4398,8 @@ aware of your profiles and configuration in ~/.aws/config.")
                 "1izcaz7mr642by7k6y4dc03bb9hj8racn4qw4xpcw0b1jj61ywn8"))))
     (build-system go-build-system)
     (native-inputs
-     `(("go-golang-org-x-crypto-ssh-terminal" ,go-golang-org-x-crypto-ssh-terminal)
-       ("go-golang-org-x-sys-unix" ,go-golang-org-x-sys-unix)
+     `(("go-golang-org-x-crypto" ,go-golang-org-x-crypto)
+       ("go-golang-org-x-sys" ,go-golang-org-x-sys)
        ("go-github-com-mitchellh-go-homedir" ,go-github-com-mitchellh-go-homedir)
        ("go-github-com-dvsekhvalnov-jose2go" ,go-github-com-dvsekhvalnov-jose2go)
        ("go-github-com-godbus-dbus" ,go-github-com-godbus-dbus)
diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index 14b6dc1d7a..e5805652a6 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -144,8 +144,8 @@ all of the regexes given on the command line in order.")
      `(("github.com/mattn/go-isatty" ,go-github-com-mattn-go-isatty)
        ("github.com/mattn/go-runewidth" ,go-github-com-mattn-go-runewidth)
        ("github.com/mattn/go-shellwords" ,go-github-com-mattn-go-shellwords)
-       ("golang.org/x/crypto/ssh/terminal" ,go-golang-org-x-crypto-ssh-terminal)
-       ("golang.org/x/sys/unix" ,go-golang-org-x-sys-unix)))
+       ("go-golang-org-x-crypto" ,go-golang-org-x-crypto)
+       ("go-golang-org-x-sys" ,go-golang-org-x-sys)))
     (propagated-inputs
      `(("tmux" ,tmux)))
     (arguments