diff --git a/astrid/build.xml b/astrid/build.xml
index 6a6bb1029..0fe069622 100644
--- a/astrid/build.xml
+++ b/astrid/build.xml
@@ -82,4 +82,28 @@
       </sequential>
     </for>
 
+    <target name="get-version">
+      <loadfile property="manifest" srcFile="AndroidManifest.xml" />
+      <propertyregex property="version.code"
+                     input="${manifest}"
+                     regexp="android:versionCode=&quot;(.*)&quot;"
+                     select="\1" />
+      <propertyregex property="version.name"
+                     input="${manifest}"
+                     regexp="android:versionName=&quot;([^ ]*)"
+                     select="\1" />
+    </target>
+      
+                     
+
+    <!-- post build: rename apk -->
+    <target name="release" depends="get-version, android_rules.release">
+      <property name="out.final.package"
+                  location="${out.absolute.dir}/${ant.project.name}-${version.code}-${version.name}-release.apk" />
+
+      <move file="${out.release.package}" tofile="${out.final.package}" />
+      <echo>Final Release Package: ${out.final.package}</echo>
+    </target>
+
+
 </project>
diff --git a/bin/androidxml2po.bash b/bin/androidxml2po.bash
index df7b2439e..4d3e18dc0 100755
--- a/bin/androidxml2po.bash
+++ b/bin/androidxml2po.bash
@@ -70,6 +70,7 @@ function import_po2xml
         done
     done
     rm -f .xml2po.mo
+    sed -i 's/\\\\/\\/g' ${android_xml_files_res_dir}-*/* 
 }
 
 function export_xml2po