diff --git a/astrid/build.xml b/astrid/build.xml
index ad26fcb0a..ffd3cb19a 100644
--- a/astrid/build.xml
+++ b/astrid/build.xml
@@ -111,7 +111,7 @@
     </target>
 
     <!-- post build: rename apk -->
-    <target name="release" depends="get-version, warnings, android_rules.release">
+    <target name="release" depends="clean, get-version, warnings, android_rules.release">
       <mkdir dir="../release" />
       <property name="out.final.package"
                 location="../release/${ant.project.name}-${manifest.version.code}-${manifest.version.name}-release.apk" />
@@ -152,7 +152,7 @@
       <copy file="AndroidManifest.xml" tofile="AndroidManifest_old.xml" />
       <replaceregexp file="AndroidManifest.xml"
                      match="(android:versionName=&quot;[^&quot; ]*)[^&quot;]*"
-                     replace="\1-${custom.version.name}" />
+                     replace="\1${custom.version.name}" />
       <antcall target="release" />
 
       <move file="AndroidManifest_old.xml" tofile="AndroidManifest.xml" />
diff --git a/build.xml b/build.xml
index 8bfec399d..622bc8665 100644
--- a/build.xml
+++ b/build.xml
@@ -29,7 +29,7 @@
     </subant>
 
     <!-- custom builds -->
-    <for list="getjar,amazon,verizon,sprint,orange,vodafone,other" param="name">
+    <for list="-getjar,.1000,-verizon,-sprint,-orange,-vodafone,-other" param="name">
       <sequential>
         <subant target="release-custom">
           <fileset file="astrid/build.xml" />