diff --git a/qdox.spec b/qdox.spec
index e320342..14a5db7 100644
--- a/qdox.spec
+++ b/qdox.spec
@@ -1,3 +1,5 @@
+%global upstream_version %(echo %{version} | tr '~' '-')
+
 Name:           qdox
 Version:        2.0~M10
 Release:        1%{?dist}
@@ -37,7 +39,7 @@ Summary:        Javadoc for %{name}
 API docs for %{name}.
 
 %prep
-%setup -q -n %{name}-%(echo %{version} | tr '~' '-')
+%setup -q -n %{name}-%{upstream_version}
 %patch0 -p1
 
 # We don't need these plugins
@@ -60,8 +62,7 @@ jflex -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/commentlexe
 %mvn_build -f -- -Dqdox.byaccj.executable=byaccj
 
 # Inject OSGi manifests
-# Even if the version contains the ~ milestone, the output is the same
-jar ufm target/%{name}-%{version}*.jar %{SOURCE1}
+jar ufm target/%{name}-%{upstream_version}.jar %{SOURCE1}
 
 %install
 %mvn_install