diff --git a/gd-tools.scm b/gd-tools.scm
index f8e2e0c..9f154e1 100644
--- a/gd-tools.scm
+++ b/gd-tools.scm
@@ -54,6 +54,7 @@
   (license
     (list license:boost1.0))))
 
+;;FIXME Cpr should be packaged properly
 (define-public libcpr
 (package
   (name "cpr")
@@ -97,14 +98,12 @@
   (name "rdricpp")
   (version "1.5")
   (source
-  (origin
-    (method git-fetch)
-    (uri
-     (git-reference
-       (url "https://codeberg.org/xieamoe/rdricpp.git")
-       (commit "26b4b518d6")))
-    (sha256
-     (base32 "0c62g68gp0ya2v9rfszrm7mxsn0anj53sfcvwav88gbws6hxriih"))))
+    (origin
+      (method git-fetch)
+      (uri (git-reference
+        (url "https://codeberg.org/xieamoe/rdricpp.git")
+        (commit "26b4b518d6")))
+      (sha256 (base32 "0c62g68gp0ya2v9rfszrm7mxsn0anj53sfcvwav88gbws6hxriih"))))
 
   (build-system cmake-build-system)
   (arguments
@@ -132,8 +131,14 @@
  (package
    (name "gd-tools")
    (version "1.5")
-   (source (local-file "." "guile-checkout"
-                      #:recursive? #t))
+  (source
+    (origin
+      (method git-fetch)
+      (uri (git-reference
+        (url "https://codeberg.org/xieamoe/gd-tools-plus.git")
+        (commit "71da66e0f1")))
+      (sha256 (base32 "0nys30qy5930004j7xnipxbn9d9k4xgbv7lzcdkrm9mapjzryh95"))))
+
    (build-system cmake-build-system)
    (arguments
      ( list #:cmake cmake