diff --git a/build/build.xml b/build/build.xml
index 4bc5663ee..09f32749b 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -33,15 +33,18 @@
     <if>
         <equals arg1="${version.extra}" arg2=""/>
         <then>
-            <property name="version.name"
+            <property name="version"
                       value="${version.major}.${version.minor}.${version.revision}"/>
+            <property name="version.filename"
+                      value="${version.major}_${version.minor}_${version.revision}"/>
         </then>
         <else>
-            <property name="version.name"
+            <property name="version"
                       value="${version.major}.${version.minor}.${version.revision}.${version.extra}"/>
+            <property name="version.filename"
+                      value="${version.major}_${version.minor}_${version.revision}_${version.extra}"/>
         </else>
     </if>
-
     <tstamp>
         <format property="builddate" pattern="MM/dd/yyyy"/>
     </tstamp>
@@ -194,7 +197,7 @@
             sourcepath="${basedir}/source"
             destdir="${javadoc.dest.dir}"
             author="true"
-            windowtitle="Smack ${version.name} Documentation"
+            windowtitle="Smack ${version} Documentation"
             overview="${basedir}/source/overview.html"
         >
             <classpath>
diff --git a/build/release.xml b/build/release.xml
index b97e18266..7716c0187 100644
--- a/build/release.xml
+++ b/build/release.xml
@@ -38,8 +38,8 @@
                 <property name="release-dev.name" value="smack-dev-${build.date}" />
             </then>
             <else>
-                <property name="release.name" value="smack-${version.name}" />
-                <property name="release-dev.name" value="smack-dev-${version.name}" />
+                <property name="release.name" value="smack-${version.filename}" />
+                <property name="release-dev.name" value="smack-dev-${version.filename}" />
             </else>
         </if>
         <property name="release.dir" value="${basedir}/target/release/${release.name}" />
@@ -106,14 +106,14 @@
             <fileset dir="${basedir}/build/resources/releasedocs" includes="*.html" />
             <filterset>
                 <filter token="builddate" value="${builddate}"/>
-                <filter token="version" value="${version.name}"/>
+                <filter token="version" value="${version}"/>
             </filterset>
         </copy>
         <copy todir="${release-dev.dir}">
             <fileset dir="${basedir}/build/resources/releasedocs" includes="*.html" />
             <filterset>
                 <filter token="builddate" value="${builddate}"/>
-                <filter token="version" value="${version.name}"/>
+                <filter token="version" value="${version}"/>
             </filterset>
         </copy>
         <!-- Package -->