diff --git a/_service b/_service
index 3bfad21..6039f15 100644
--- a/_service
+++ b/_service
@@ -3,7 +3,9 @@
     <param name="url">http://git.haproxy.org/git/haproxy-1.8.git</param>
     <param name="scm">git</param>
     <param name="filename">haproxy</param>
-    <param name="versionformat">1.8.9~git@PARENT_TAG@.@TAG_OFFSET@.%h</param>
+    <param name="versionformat">@PARENT_TAG@~git@TAG_OFFSET@.%h</param>
+    <param name="versionrewrite-pattern">v(.*)</param>
+    <param name="versionrewrite-replacement">\1</param>    
     <param name="revision">master</param>
     <param name="changesgenerate">enable</param>
   </service>
diff --git a/haproxy-1.8.9~git9.6d82e611.tar.gz b/haproxy-1.8.9~git9.6d82e611.tar.gz
new file mode 100644
index 0000000..afcfc77
--- /dev/null
+++ b/haproxy-1.8.9~git9.6d82e611.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6c7df55b2ee6f4710798a3e2bd81769d6a8b40a66b23525ffa9cc57b7bdb0ad7
+size 2115973
diff --git a/haproxy-1.8.9~gitv1.8.9.9.6d82e611.tar.gz b/haproxy-1.8.9~gitv1.8.9.9.6d82e611.tar.gz
deleted file mode 100644
index 0bd18e1..0000000
--- a/haproxy-1.8.9~gitv1.8.9.9.6d82e611.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d33cbffe77991159cdd581068591009eee19052e1bc1fbba0bb9c85da13eb445
-size 2116658
diff --git a/haproxy.changes b/haproxy.changes
index 68a5db4..b8839f3 100644
--- a/haproxy.changes
+++ b/haproxy.changes
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Tue May 29 07:09:26 UTC 2018 - kgronlund@suse.com
 
-- Update to version 1.8.9~gitv1.8.9.9.6d82e611:
+- Update to version 1.8.9~git9.6d82e611:
   * BUG/MEDIUM: cache: don't cache when an Authorization header is present (VUL-1) (bsc#1094846)
   * BUG/MEDIUM: dns: Delay the attempt to run a DNS resolution on check failure.
   * BUG/MINOR: ssl/lua: prevent lua from affecting automatic maxconn computation
diff --git a/haproxy.spec b/haproxy.spec
index 4a48d28..67488ba 100644
--- a/haproxy.spec
+++ b/haproxy.spec
@@ -40,7 +40,7 @@
 %bcond_without  apparmor
 
 Name:           haproxy
-Version:        1.8.9~gitv1.8.9.9.6d82e611
+Version:        1.8.9~git9.6d82e611
 Release:        0
 #
 #