diff --git a/tools/git2debcl b/tools/git2debcl
index 707ced08..46f9ac22 100755
--- a/tools/git2debcl
+++ b/tools/git2debcl
@@ -97,9 +97,10 @@ def main():
     if args.codename == '::guess::':
         args.codename = guess_codename()
 
+    versuffix = "~"+args.distro+"-"+args.codename
+
     if args.version == '::guess::':
-        ver = git_version()
-        args.version = ver+"~"+args.distro+"-"+args.codename
+        args.version = git_version()
 
     tags = git_tags()
 
@@ -111,6 +112,9 @@ def main():
         tags = zip(tags,tags)
         tags.insert(0,(args.version,'HEAD'))
 
+    for i in xrange(0,len(tags)):
+        tags[i] = (tags[i][0] + versuffix,tags[i][1])
+
     tag = tags[0]
     for prev in tags[1:]:
         lines = git_log(tag[1],prev[1])