diff --git a/build.xml b/build.xml
index c3d77e11..dbc5d9c1 100644
--- a/build.xml
+++ b/build.xml
@@ -116,7 +116,7 @@
 			</then>
 			<else>
 				<exec dir="${build-directory}" command="echo $BUILD_NUMBER" outputProperty="version.override" passthru="true" />
-				<property name="version" value="${BUILD_NUMBER}" override="true" />
+				<property name="version" value="${version.override}" override="true" />
 			</else>
 		</if>
 	</target>
@@ -204,7 +204,7 @@
         </phingcall>
 
         <phingcall target="wrap-package">
-            <property name="destination-filename" value="${build-directory}/upload/${vendor-name}_${extension-name}-${version}" />
+            <property name="destination-filename" value="${build-directory}/upload/${vendor-name}_${extension-name}_${version}" />
         </phingcall>
     </target>