diff --git a/_service b/_service
index c473683..fa601de 100644
--- a/_service
+++ b/_service
@@ -5,8 +5,8 @@
enable
v0.9.0
@PARENT_TAG@+@TAG_OFFSET@
- v(.*)
- \1
+ v([^+]*)(\+0)?(\+[1-9][0-9]*)?
+ \1\3
diff --git a/b4-0.9.0+0.obscpio b/b4-0.9.0+0.obscpio
deleted file mode 100644
index 5c32c7e..0000000
--- a/b4-0.9.0+0.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dd6770fe51ce9bff28cf50758d27d9c6e1012cbdb935e8490061266acda9c191
-size 592908
diff --git a/b4-0.9.0.obscpio b/b4-0.9.0.obscpio
new file mode 100644
index 0000000..6063ab0
--- /dev/null
+++ b/b4-0.9.0.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ddeeec9759e86bc16a66d3880f37230ad01a51637ebc89267613cd11bf23a329
+size 592908
diff --git a/b4.changes b/b4.changes
index 29b6016..d197804 100644
--- a/b4.changes
+++ b/b4.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jun 23 11:39:42 UTC 2022 - Dominique Leuenberger
+
+- Fix _service: Do not add +0 to version when we are directly on a
+ tagged revision (so: 0.9.0 instead of 0.9.0+0).
+
-------------------------------------------------------------------
Sun Jun 19 07:51:21 UTC 2022 - jslaby@suse.cz
diff --git a/b4.obsinfo b/b4.obsinfo
index 6cf87ae..285cd44 100644
--- a/b4.obsinfo
+++ b/b4.obsinfo
@@ -1,4 +1,4 @@
name: b4
-version: 0.9.0+0
+version: 0.9.0
mtime: 1655490181
commit: 409c865175bf8f103bf5633331e8a1d77a446814
diff --git a/b4.spec b/b4.spec
index bea1180..c76ab01 100644
--- a/b4.spec
+++ b/b4.spec
@@ -16,9 +16,9 @@
#
-%define version_unconverted 0.9.0+0
+%define version_unconverted 0.9.0
Name: b4
-Version: 0.9.0+0
+Version: 0.9.0
Release: 0
Summary: Helper scripts for kernel.org patches
License: GPL-2.0-or-later