diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index cf8d378704..7844e429b1 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -12184,6 +12184,32 @@ exploration and data entry.")
 @url{https://unicode.org/reports/tr29/, Unicode Standard Annex #29}.")
     (license license:expat)))
 
+(define-public go-github-com-riywo-loginshell
+  (package
+    (name "go-github-com-riywo-loginshell")
+    (version "0.0.0-20200815045211-7d26008be1ab")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/riywo/loginshell")
+             (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "138yvis6lipw9x02jyiz7472bxi20206bcfikcar54i3xsww9q4i"))))
+    (build-system go-build-system)
+    (arguments
+     (list #:import-path "github.com/riywo/loginshell"
+           ;; Tests try to get the current user's login shell; the build
+           ;; user doesn't have one.
+           #:tests? #f))
+    (home-page "https://github.com/riywo/loginshell")
+    (synopsis "Get the user's login shell in Go")
+    (description
+     "The loginshell package provides a Go library to get the login shell of
+the current user.")
+    (license license:expat)))
+
 (define-public go-github-com-robfig-cron-v3
   (package
     (name "go-github-com-robfig-cron-v3")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index e64ef22b0a..8e1b0c26a4 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -2996,32 +2996,6 @@ using shell-style rules for quoting and commenting.")
      (base32
       "1lk91s00y4qy4pjh8638b5lfkgwyl282g1m27srsf7qfn58y16a2"))))
 
-(define-public go-github-com-riywo-loginshell
-  (package
-    (name "go-github-com-riywo-loginshell")
-    (version "0.0.0-20200815045211-7d26008be1ab")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/riywo/loginshell")
-                    (commit (go-version->git-ref version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "138yvis6lipw9x02jyiz7472bxi20206bcfikcar54i3xsww9q4i"))))
-    (build-system go-build-system)
-    (arguments
-     (list #:import-path "github.com/riywo/loginshell"
-           ;; Tests try to get the current user's login shell; the build
-           ;; user doesn't have one.
-           #:tests? #f))
-    (home-page "https://github.com/riywo/loginshell")
-    (synopsis "Get the user's login shell in Go")
-    (description
-     "The loginshell package provides a Go library to get the login shell
-of the current user.")
-    (license license:expat)))
-
 ;;;
 ;;; Avoid adding new packages to the end of this file. To reduce the chances
 ;;; of a merge conflict, place them above by existing packages with similar