diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm
index 0eb4362858..df4c8ef4f6 100644
--- a/gnu/packages/gps.scm
+++ b/gnu/packages/gps.scm
@@ -222,14 +222,16 @@ such as elevation, speed, heart rate, power, temperature, and gear shifts.")
 (define-public gpsd
   (package
     (name "gpsd")
-    (version "3.21")
+    (version "3.23-rc1")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://download-mirror.savannah.gnu.org"
-                           "/releases/gpsd/gpsd-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://gitlab.com/gpsd/gpsd")
+              (commit "7f30d88d04dc62b8bd6265ad1d09d72d220f97f6")))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "14gyqrbrq6jz4y6x59rdpv9d4c3pbn0vh1blq3iwrc6kz0x4ql35"))))
+        (base32 "0n2ba6n2z3qjnjl2lvzqrp71x2rkip17p0r9hflviwkzcfr7ppdk"))))
     (build-system scons-build-system)
     (native-inputs
      `(("bc" ,bc)
@@ -259,6 +261,7 @@ such as elevation, speed, heart rate, power, temperature, and gear shifts.")
        (modify-phases %standard-phases
          (add-after 'unpack 'fix-build
            (lambda* (#:key outputs #:allow-other-keys)
+             (setenv "TAR" "noop")
              (substitute* "SConstruct"
                (("envs = \\{\\}")
                 "envs = os.environ"))