diff --git a/roles/archbuild/files/gitpkg b/roles/archbuild/files/gitpkg
index e442cf7a775b54d8930eaad4003d672d8103ddc5..a394bfc4185508a0a54b2e22e9d8ef281401d807 100755
--- a/roles/archbuild/files/gitpkg
+++ b/roles/archbuild/files/gitpkg
@@ -383,7 +383,7 @@ if gitify
         warn "pkgver() deduction failed: #{e}"
       end
 
-      ver_sed << "s/-/+/g"
+      ver_sed << "s/[^-]*-g/r&/;s/-/+/g"
 
       <<~END
         cd #{localname}