diff --git a/dfsg/main/minesviiper.scm b/dfsg/main/minesviiper.scm
index 04cfb22..f0f94c0 100644
--- a/dfsg/main/minesviiper.scm
+++ b/dfsg/main/minesviiper.scm
@@ -26,7 +26,7 @@
         (revision "1"))
     (package
       (name "minesviiper")
-      (version (string-append "0.0.0-" revision "." (string-take commit 7)))
+      (version (git-version "0.0.0" revision commit))
       (source
         (origin
           (method git-fetch)
diff --git a/dfsg/main/solvitaire.scm b/dfsg/main/solvitaire.scm
index ed5db23..94e0a11 100644
--- a/dfsg/main/solvitaire.scm
+++ b/dfsg/main/solvitaire.scm
@@ -26,7 +26,7 @@
         (revision "4"))
     (package
       (name "solvitaire")
-      (version (string-append "0.0.0-" revision "." (string-take commit 7)))
+      (version (git-version "0.0.0" revision commit))
       (source
         (origin
           (method git-fetch)
diff --git a/dfsg/main/viper.scm b/dfsg/main/viper.scm
index a2fcd2f..c39949f 100644
--- a/dfsg/main/viper.scm
+++ b/dfsg/main/viper.scm
@@ -26,7 +26,7 @@
         (revision "2"))
     (package
       (name "viper")
-      (version (string-append "0.0.0-" revision "." (string-take commit 7)))
+      (version (git-version "0.0.0" revision commit))
       (source
         (origin
           (method git-fetch)
diff --git a/wip/edone.scm b/wip/edone.scm
index 2bf3efe..d970ebd 100644
--- a/wip/edone.scm
+++ b/wip/edone.scm
@@ -29,7 +29,7 @@
         (revision "1"))
   (package
     (name "edone")
-    (version (string-append "0.0.0-" revision "." (string-take commit 7)))
+    (version (git-version "0.0.0" revision commit))
     (source
       (origin
         (method git-fetch)
diff --git a/wip/emacs-aria2.scm b/wip/emacs-aria2.scm
index 63d97c7..b047696 100644
--- a/wip/emacs-aria2.scm
+++ b/wip/emacs-aria2.scm
@@ -52,7 +52,7 @@ This mode tries to work well with evil-mode, just set aria2-add-evil-quirks to t
     (package
       (inherit emacs-aria2)
       (name "emacs-aria2el")
-      (version (string-append "0.0.0-" revision "." (string-take commit 7)))
+      (version (git-version "0.0.0" revision commit))
       (source
         (origin
           (method git-fetch)
diff --git a/wip/empc.scm b/wip/empc.scm
index fa7fb30..e073e09 100644
--- a/wip/empc.scm
+++ b/wip/empc.scm
@@ -32,7 +32,7 @@
         (revision "2"))
   (package
     (name "empc")
-    (version (string-append "0.99.0.0-" revision "." (string-take commit 7)))
+    (version (git-version "0.99.0.0" revision commit))
     (source
       (origin
         (method git-fetch)
diff --git a/wip/etui.scm b/wip/etui.scm
index 236d74c..4e0b470 100644
--- a/wip/etui.scm
+++ b/wip/etui.scm
@@ -29,7 +29,7 @@
         (revision "1"))
   (package
     (name "etui")
-    (version (string-append "0.0.0-" revision "." (string-take commit 7)))
+    (version (git-version "0.0.0" revision commit))
     (source
       (origin
         (method git-fetch)