diff --git a/_service b/_service
index e32c728..18e57c0 100644
--- a/_service
+++ b/_service
@@ -2,11 +2,10 @@
 	<service name="tar_scm" mode="disabled">
 		<param name="scm">git</param>
 		<param name="url">https://github.com/apache/maven-doxia-sitetools.git</param>
-		<param name="revision">doxia-sitetools-2.0.0-M19</param>
+		<param name="revision">doxia-sitetools-2.0.0</param>
 		<param name="match-tag">doxia-*</param>
 		<param name="versionformat">@PARENT_TAG@</param>
-		<param name="versionrewrite-pattern">doxia-sitetools-(\d+).(\d+).(\d+)-(.*)</param>
-        <param name="versionrewrite-replacement">\1.\2.\3~\4</param>
+		<param name="versionrewrite-pattern">doxia-sitetools-(.*)</param>
 	</service>
 	<service name="recompress" mode="disabled">
 		<param name="file">*.tar</param>
diff --git a/maven-doxia-sitetools-2.0.0.tar.xz b/maven-doxia-sitetools-2.0.0.tar.xz
new file mode 100644
index 0000000..cff10b7
--- /dev/null
+++ b/maven-doxia-sitetools-2.0.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4d7350f52ff5ef767437cd3b4d5183c0ffb51484886bb34ede9e3ed198dd51ef
+size 169748
diff --git a/maven-doxia-sitetools-2.0.0~M19.tar.xz b/maven-doxia-sitetools-2.0.0~M19.tar.xz
deleted file mode 100644
index 44be8f0..0000000
--- a/maven-doxia-sitetools-2.0.0~M19.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d8bc9dc23d8b8a0f73746fe211161d44309003facb8c6d584a1e7ef6f8aacb64
-size 169452
diff --git a/maven-doxia-sitetools-build.tar.xz b/maven-doxia-sitetools-build.tar.xz
index dc18674..cb15353 100644
--- a/maven-doxia-sitetools-build.tar.xz
+++ b/maven-doxia-sitetools-build.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e96c4fe83c8bdb13590022898b649463806b691a4d9a5a4e05e4891bc22a0b67
-size 2588
+oid sha256:51266555bf1146383d58e18c9d2e27ae2452c1ce13902d755558a6b7c3194e1d
+size 2644
diff --git a/maven-doxia-sitetools.spec b/maven-doxia-sitetools.spec
index 3fa1e8c..3789855 100644
--- a/maven-doxia-sitetools.spec
+++ b/maven-doxia-sitetools.spec
@@ -16,9 +16,8 @@
 #
 
 
-%global pom_version 2.0.0-M19
 Name:           maven-doxia-sitetools
-Version:        2.0.0~M19
+Version:        2.0.0
 Release:        0
 Summary:        Doxia content generation framework
 License:        Apache-2.0
@@ -108,7 +107,7 @@ for i in \
     doxia-skin-model \
     doxia-site-renderer \
     doxia-integration-tools; do
-  install -pm 0644 ${i}/target/${i}-%pom_version.jar %{buildroot}%{_javadir}/%{name}/${i}.jar
+  install -pm 0644 ${i}/target/${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${i}.jar
   %{mvn_install_pom} ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
   %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar -f ${i}
   if [ -d ${i}/target/site/apidocs ]; then