diff --git a/metadata/com.alfray.timeriffic.txt b/metadata/com.alfray.timeriffic.txt
index 0932cc86b0..e979e3c2a4 100644
--- a/metadata/com.alfray.timeriffic.txt
+++ b/metadata/com.alfray.timeriffic.txt
@@ -15,7 +15,7 @@ Status: Source code was last published in 2011.
 Build Version:1.09.03,10903,!huge ass version name at 45,subdir=Timeriffic,oldsdkloc=yes
 
 #This version was from https://timeriffic.googlecode.com/hg
-Build Version:1.09.05,10905,fc40dccbb9,subdir=Timeriffic,oldsdkloc=yes,novcheck=yes,bindir=Timeriffic/bin2
+Build Version:1.09.05,10905,fc40dccbb9,subdir=Timeriffic,oldsdkloc=yes,novcheck=yes
 
 Build Version:1.10.01,11001,!Source code is not published
 
diff --git a/metadata/com.androsz.electricsleepbeta.txt b/metadata/com.androsz.electricsleepbeta.txt
index ffc94cff9f..94248f9170 100644
--- a/metadata/com.androsz.electricsleepbeta.txt
+++ b/metadata/com.androsz.electricsleepbeta.txt
@@ -28,8 +28,7 @@ build=$$MVN3$$ install:install-file \
    -DgroupId=com.google.android.apps \
    -DartifactId=analytics \
    -Dversion=0.0.1 \
-   -Dpackaging=apklib,\
-bindir=target
+   -Dpackaging=apklib
 
 Auto Update Mode:None
 #Tags are for development
diff --git a/metadata/com.blogspot.tonyatkins.freespeech.txt b/metadata/com.blogspot.tonyatkins.freespeech.txt
index 1cb0175e94..4b126cf660 100644
--- a/metadata/com.blogspot.tonyatkins.freespeech.txt
+++ b/metadata/com.blogspot.tonyatkins.freespeech.txt
@@ -25,21 +25,18 @@ Build:1.17,117
     maven=yes
     prebuild=rm -rf target && \
         sed -i '45 i \\tandroid:debuggable=\"false\"' AndroidManifest.xml
-    bindir=target
 
 Build:1.19,119
     commit=freespeech-1.19
     maven=yes
     forceversion=yes
     forcevercode=yes
-    bindir=target
 
 Build:1.21,121
     commit=e293b4a
     maven=yes
     forceversion=yes
     forcevercode=yes
-    bindir=target
 
 Build:1.24,124
     commit=freespeech-1.24
diff --git a/metadata/com.botbrew.basil.txt b/metadata/com.botbrew.basil.txt
index a00e1e7b4e..42f471acf0 100644
--- a/metadata/com.botbrew.basil.txt
+++ b/metadata/com.botbrew.basil.txt
@@ -39,7 +39,7 @@ sed -i 's@\(android.library.reference.3=\).*@\1$$EmulatorView$$@' project.proper
 sed -i 's@~/android-ndk-r8@$$NDK$$@g' mkjni.sh && ./mkjni.sh,buildjni=no
 Build Version:0.0.1.24,24,733293d904,maven=yes,prebuild=\
 ./external.sh && sed -i 's@~/android-ndk-r8b@$$NDK$$@g' mkjni.sh && ./mkjni.sh,\
-buildjni=no,bindir=target
+buildjni=no
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
diff --git a/metadata/com.github.andlyticsproject.txt b/metadata/com.github.andlyticsproject.txt
index 41c53dd9e3..623a5cf5bd 100644
--- a/metadata/com.github.andlyticsproject.txt
+++ b/metadata/com.github.andlyticsproject.txt
@@ -18,23 +18,23 @@ Repo:https://github.com/AndlyticsProject/andlytics.git
 
 Build:2.4.3,226
     commit=v2.4.3
-    bindir=build
+    init=rm -f ant.properties
 
 Build:2.5.1,228
     commit=v2.5.1
-    bindir=build
+    init=rm -f ant.properties
 
 Build:2.5.5,233
     commit=v2.5.5
-    bindir=build
+    init=rm -f ant.properties
 
 Build:2.5.6,238
     commit=v2.5.6
-    bindir=build
+    init=rm -f ant.properties
 
 Build:2.5.7,243
     commit=v2.5.7
-    bindir=build
+    init=rm -f ant.properties
 
 Auto Update Mode:None
 Update Check Mode:Tags
diff --git a/metadata/com.github.mobile.txt b/metadata/com.github.mobile.txt
index 65dd645c76..70202ecb6e 100644
--- a/metadata/com.github.mobile.txt
+++ b/metadata/com.github.mobile.txt
@@ -26,44 +26,36 @@ Repo:https://github.com/github/android.git
 Build:1.1,600
     commit=1.1
     maven=yes
-    bindir=app/target
 
 Build:1.2,700
     commit=1.2
     maven=yes
-    bindir=app/target
 
 Build:1.3.1,900
     commit=1.3.1
     maven=yes
-    bindir=app/target
 
 Build:1.4,1000
     commit=1.4
     maven=yes
-    bindir=app/target
 
 Build:1.5,1100
     commit=1.5
     maven=yes
-    bindir=app/target
 
 Build:1.6.1,1300
     commit=1.6.1
     maven=yes
-    bindir=app/target
 
 Build:1.7,1400
     commit=9e6a9f3d7daf
     subdir=app
     maven=yes
-    bindir=app/target
 
 Build:1.7.1,1500
     commit=1.7.1
     subdir=app
     maven=yes
-    bindir=app/target
 
 Build:1.7.3,1700
     commit=1.7.3
diff --git a/metadata/com.madgag.agit.txt b/metadata/com.madgag.agit.txt
index 4c3888eb93..2793a5f44f 100644
--- a/metadata/com.madgag.agit.txt
+++ b/metadata/com.madgag.agit.txt
@@ -23,14 +23,12 @@ Repo:https://github.com/rtyley/agit.git
 Build:1.34,130300716
     commit=agit-parent-1.34
     maven=yes
-    bindir=agit/target
     novcheck=yes
 
 Build:1.38,130400912
     commit=agit-parent-1.38
     maven=yes
     prebuild=sed -i '/agit-integration-tests/d' pom.xml
-    bindir=agit/target
     novcheck=yes
 
 Build:1.38,130701616
diff --git a/metadata/com.mendhak.gpslogger.txt b/metadata/com.mendhak.gpslogger.txt
index 89fae313e7..65d5bb6dbe 100644
--- a/metadata/com.mendhak.gpslogger.txt
+++ b/metadata/com.mendhak.gpslogger.txt
@@ -28,7 +28,7 @@ which we would recommend using instead.
 Repo Type:git
 Repo:https://github.com/mendhak/gpslogger.git
 
-Build Version:23,23,!can't find apk fedb6b7d8b,subdir=GPSLogger,maven=yes,bindir=GPSLogger/target
+Build Version:23,23,!can't find apk fedb6b7d8b,subdir=GPSLogger,maven=yes
 Build Version:27-fdroid,27,0633f2947,forceversion=yes,subdir=GPSLogger,extlibs=\
 json-simple/json_simple-1.1.jar;mime4j/apache-mime4j-0.6.1.jar;\
 oauth-signpost/signpost-commonshttp4-1.2.1.1.jar;oauth-signpost/signpost-core-1.2.1.1.jar;\
diff --git a/metadata/com.smerty.ham.txt b/metadata/com.smerty.ham.txt
index 75c7868955..abbb5d716f 100644
--- a/metadata/com.smerty.ham.txt
+++ b/metadata/com.smerty.ham.txt
@@ -19,7 +19,7 @@ limited use for many users.
 Repo Type:git
 Repo:https://github.com/Smerty/ham.android.git
 
-Build Version:1.5.7,18,8721a4ecf8,maven=yes,bindir=target,prebuild=\
+Build Version:1.5.7,18,8721a4ecf8,maven=yes,prebuild=\
 sed -i 's/true/false/g' AndroidManifest.xml
 Build Version:1.6.0,19,!not on gplay at b1b76390a0,srclibs=Ion@c41d79c606;etc@etc,prebuild=\
 sed -i 's/true/false/g' AndroidManifest.xml
diff --git a/metadata/com.yubico.yubioath.txt b/metadata/com.yubico.yubioath.txt
index 35b861eefb..58b0ca4347 100644
--- a/metadata/com.yubico.yubioath.txt
+++ b/metadata/com.yubico.yubioath.txt
@@ -27,12 +27,10 @@ Repo:git://github.com/Yubico/yubioath-android.git
 Build:0.0.4,10
     commit=yubioath-0.0.4
     maven=yes
-    bindir=target
 
 Build:0.1.3,14
     commit=yubioath-0.1.3
     maven=yes
-    bindir=target
 
 Build:0.1.4,15
     commit=yubioath-0.1.4
diff --git a/metadata/com.yubico.yubitotp.txt b/metadata/com.yubico.yubitotp.txt
index a8f6ed7597..69ae5180af 100644
--- a/metadata/com.yubico.yubitotp.txt
+++ b/metadata/com.yubico.yubitotp.txt
@@ -24,8 +24,8 @@ The YubiTOTP app is still maintained for backwards compatibility.
 Repo Type:git
 Repo:git://github.com/Yubico/yubitotp-android.git
 
-Build Version:0.0.2,4,YubiTOTP-0.0.2,maven=yes,bindir=target
-Build Version:0.0.3,6,YubiTOTP-0.0.3,maven=yes,bindir=target
+Build Version:0.0.2,4,YubiTOTP-0.0.2,maven=yes
+Build Version:0.0.3,6,YubiTOTP-0.0.3,maven=yes
 
 Auto Update Mode:None
 Update Check Mode:Tags
diff --git a/metadata/damo.three.ie.txt b/metadata/damo.three.ie.txt
index 02eda8e2f7..29ff3cbd6c 100644
--- a/metadata/damo.three.ie.txt
+++ b/metadata/damo.three.ie.txt
@@ -23,8 +23,7 @@ Repo Type:git
 #Repo:https://github.com/DamienOReilly/My3Usage.git
 Repo:https://github.com/DamienOReilly/PrepayCredit.git
 
-Build Version:0.8,8,ab4f06d899,subdir=My3Android,\
-maven=yes,bindir=My3Android/target
+Build Version:0.8,8,ab4f06d899,subdir=My3Android,maven=yes
 Build Version:0.9,9,v0.9,subdir=PrepayCreditAndroid,maven=yes
 
 Auto Update Mode:None
diff --git a/metadata/de.danoeh.antennapod.txt b/metadata/de.danoeh.antennapod.txt
index a1623913ba..0ebb32a169 100644
--- a/metadata/de.danoeh.antennapod.txt
+++ b/metadata/de.danoeh.antennapod.txt
@@ -65,13 +65,13 @@ Build Version:0.9.6.1,22,0.9.6.1,srclibs=ActionBarSherlock@4.1.0;ViewPagerIndica
 Build Version:0.9.6.2,23,0.9.6.2,srclibs=ActionBarSherlock@4.1.0;ViewPagerIndicator@2.3.1,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && sed -i 's@\(android.library.reference.2=\).*@\1$$ViewPagerIndicator$$@' project.properties && cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java,extlibs=flattr4j/flattr4j-core-2.4.jar;commons-lang/commons-lang3-3.1.jar;commons-io/commons-io-2.4.jar
 Build Version:0.9.6.3,24,0.9.6.3,srclibs=ActionBarSherlock@4.1.0;ViewPagerIndicator@2.3.1,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && sed -i 's@\(android.library.reference.2=\).*@\1$$ViewPagerIndicator$$@' project.properties && cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java,extlibs=flattr4j/flattr4j-core-2.4.jar;commons-lang/commons-lang3-3.1.jar;commons-io/commons-io-2.4.jar
 Build Version:0.9.6.4,25,0.9.6.4,srclibs=ActionBarSherlock@4.1.0;ViewPagerIndicator@2.4.1,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && sed -i 's@\(android.library.reference.2=\).*@\1$$ViewPagerIndicator$$@' project.properties && cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java,extlibs=flattr4j/flattr4j-core-2.4.jar;commons-lang/commons-lang3-3.1.jar;commons-io/commons-io-2.4.jar
-Build Version:0.9.7,26,0.9.7,maven=yes,submodules=yes,bindir=target,init=\
+Build Version:0.9.7,26,0.9.7,maven=yes,submodules=yes,init=\
 ANDROID_HOME=$$SDK$$ mvn clean install -f submodules/dslv/pom.xml && rm -f submodules/dslv/demo/target/*.apk,\
 prebuild=cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java
-Build Version:0.9.7.1,28,!bad bug (at 0.9.7.1),submodules=yes,maven=yes,init=ANDROID_HOME=$$SDK$$ mvn clean install -f submodules/dslv/pom.xml && rm -f submodules/dslv/demo/target/*.apk,prebuild=cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java ,bindir=target
-Build Version:0.9.7.2,29,0.9.7.2,submodules=yes,maven=yes,init=ANDROID_HOME=$$SDK$$ mvn clean install -f submodules/dslv/pom.xml && rm -f submodules/dslv/demo/target/*.apk,prebuild=cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java ,bindir=target
-Build Version:0.9.7.3,30,0.9.7.3,submodules=yes,maven=yes,init=ANDROID_HOME=$$SDK$$ mvn clean install -f submodules/dslv/pom.xml && rm -f submodules/dslv/demo/target/*.apk,prebuild=cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java && sed -i '32 i \\tandroid:debuggable=\"false\"' AndroidManifest.xml,bindir=target
-Build Version:0.9.7.4,31,0.9.7.4,submodules=yes,maven=yes,init=ANDROID_HOME=$$SDK$$ mvn clean install -f submodules/dslv/pom.xml && rm -f submodules/dslv/demo/target/*.apk,prebuild=cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java && sed -i '97s/true/false/g' pom.xml,bindir=target
+Build Version:0.9.7.1,28,!bad bug (at 0.9.7.1),submodules=yes,maven=yes,init=ANDROID_HOME=$$SDK$$ mvn clean install -f submodules/dslv/pom.xml && rm -f submodules/dslv/demo/target/*.apk,prebuild=cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java
+Build Version:0.9.7.2,29,0.9.7.2,submodules=yes,maven=yes,init=ANDROID_HOME=$$SDK$$ mvn clean install -f submodules/dslv/pom.xml && rm -f submodules/dslv/demo/target/*.apk,prebuild=cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java
+Build Version:0.9.7.3,30,0.9.7.3,submodules=yes,maven=yes,init=ANDROID_HOME=$$SDK$$ mvn clean install -f submodules/dslv/pom.xml && rm -f submodules/dslv/demo/target/*.apk,prebuild=cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java && sed -i '32 i \\tandroid:debuggable=\"false\"' AndroidManifest.xml
+Build Version:0.9.7.4,31,0.9.7.4,submodules=yes,maven=yes,init=ANDROID_HOME=$$SDK$$ mvn clean install -f submodules/dslv/pom.xml && rm -f submodules/dslv/demo/target/*.apk,prebuild=cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java && sed -i '97s/true/false/g' pom.xml
 Build Version:0.9.7.5,32,!broken 0.9.7.5,submodules=yes,gradle=yes,\
 prebuild=cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java
 Build Version:0.9.8.0,33,0.9.8.0,prebuild=cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java,submodules=yes,gradle=yes
diff --git a/metadata/de.schildbach.wallet.txt b/metadata/de.schildbach.wallet.txt
index 36290280ee..e21743ef08 100644
--- a/metadata/de.schildbach.wallet.txt
+++ b/metadata/de.schildbach.wallet.txt
@@ -54,7 +54,6 @@ Build:2.01,74
     srclibs=BitcoinJWallet@31953d239555
     prebuild=mvn install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3_r2 -Dpackaging=jar -Dfile=$$SDK$$/platforms/android-10/android.jar && \
         mvn install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar
-    bindir=wallet/target
 
 Build:2.16,87
     commit=49c3da045e57
@@ -68,7 +67,6 @@ Build:2.16,87
         cd ../wallet && \
         mvn3 install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3_r2 -Dpackaging=jar -Dfile=$$SDK$$/platforms/android-10/android.jar && \
         mvn3 install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar
-    bindir=wallet/target
 
 Build:3.01,121
     commit=742241f59df1
@@ -78,7 +76,6 @@ Build:3.01,121
     prebuild=sed -i '54 i \\tandroid:debuggable=\"false\"' wallet/AndroidManifest.xml && \
         cp -r $$BitcoinJWallet$$/ . && \
         rm -rf market/
-    bindir=wallet/target
 
 Build:3.04,124
     commit=3efa5beb206e
@@ -87,7 +84,6 @@ Build:3.04,124
     patch=pom.patch
     prebuild=cp -r $$BitcoinJWallet$$/ . && \
         rm -rf market/
-    bindir=wallet/target
 
 # source plugin causes an error after building: 
 # W/asset   (16561) Asset path target/library-4.1.0.apk is neither a directory nor file (type=1).
@@ -99,7 +95,6 @@ Build:3.14,134
         cp -r $$BitcoinJWallet$$/ . && \
         rm -rf market/
     build=$$MVN3$$ clean install -f BitcoinJWallet/pom.xml
-    bindir=wallet/target
 
 # important bugfix so uses the original BitcoinJ
 Build:3.15,136
@@ -111,7 +106,6 @@ Build:3.15,136
         cp -r $$BitcoinJWallet-origin$$/ . && \
         rm -rf market/
     build=$$MVN3$$ clean install -DskipTests -f BitcoinJWallet-origin/pom.xml
-    bindir=wallet/target
 
 Build:3.19,140
     commit=885f13e01a86
@@ -121,7 +115,6 @@ Build:3.19,140
         cp -r $$BitcoinJWallet$$/ . && \
         rm -rf market/
     build=$$MVN3$$ clean install -DskipTests -f BitcoinJWallet/pom.xml
-    bindir=wallet/target
 
 Build:3.22,143
     commit=8e67f8ea6e38
diff --git a/metadata/de.schildbach.wallet_test.txt b/metadata/de.schildbach.wallet_test.txt
index ffab070575..bf396606b0 100644
--- a/metadata/de.schildbach.wallet_test.txt
+++ b/metadata/de.schildbach.wallet_test.txt
@@ -33,7 +33,6 @@ Build:2.01_test,74
     srclibs=BitcoinJWallet@31953d239555
     prebuild=$$MVN3$$ install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3_r2 -Dpackaging=jar -Dfile=$$SDK$$/platforms/android-10/android.jar && \
         $$MVN3$$ install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar
-    bindir=wallet/target
 
 Build:2.02_test,75
     commit=d32701a4ce99
@@ -45,7 +44,6 @@ Build:2.02_test,75
         cd - && \
         $$MVN3$$ install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3_r2 -Dpackaging=jar -Dfile=$$SDK$$/platforms/android-10/android.jar && \
         $$MVN3$$ install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar
-    bindir=wallet/target
 
 Build:2.16_test,87
     commit=49c3da045e57
@@ -60,7 +58,6 @@ Build:2.16_test,87
         cd ../wallet && \
         mvn3 install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3_r2 -Dpackaging=jar -Dfile=$$SDK$$/platforms/android-10/android.jar && \
         mvn3 install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar
-    bindir=wallet/target
     extibs=android/android-support-v4.jar
 
 Build:3.01-test,121
@@ -71,7 +68,6 @@ Build:3.01-test,121
     prebuild=sed -i '54 i \\tandroid:debuggable=\"false\"' wallet/AndroidManifest.xml && \
         cp -r $$BitcoinJWallet$$/ . && \
         rm -rf market/
-    bindir=wallet/target
 
 Build:3.04-test,124
     commit=v3.04
@@ -80,7 +76,6 @@ Build:3.04-test,124
     patch=pom.patch
     prebuild=cp -r $$BitcoinJWallet$$/ . && \
         rm -rf market/
-    bindir=wallet/target
 
 Build:3.14-test,134
     commit=v3.14
@@ -90,7 +85,6 @@ Build:3.14-test,134
         cp -r $$BitcoinJWallet$$/ . && \
         rm -rf market/
     build=$$MVN3$$ clean install -f BitcoinJWallet/pom.xml
-    bindir=wallet/target
 
 Build:3.15-test,135
     commit=3dbf4ba44ff8
@@ -100,7 +94,6 @@ Build:3.15-test,135
         cp -r $$BitcoinJWallet-origin$$/ . && \
         rm -rf market/
     build=$$MVN3$$ clean install -DskipTests -f BitcoinJWallet-origin/pom.xml
-    bindir=wallet/target
 
 Build:3.18-test,139
     commit=v3.18
@@ -110,7 +103,6 @@ Build:3.18-test,139
         cp -r $$BitcoinJWallet$$/ . && \
         rm -rf market/
     build=$$MVN3$$ clean install -DskipTests -f BitcoinJWallet/pom.xml
-    bindir=wallet/target
 
 Build:3.23-test,144
     commit=b75b225c7289
diff --git a/metadata/net.anzix.osm.upload.txt b/metadata/net.anzix.osm.upload.txt
index dd8397bbb7..5dca9cb036 100644
--- a/metadata/net.anzix.osm.upload.txt
+++ b/metadata/net.anzix.osm.upload.txt
@@ -21,8 +21,8 @@ Repo:https://github.com/elek/osmgpxuploader.git
 Build Version:1.5.3,10,4ebed08421d7,maven=yes,prebuild=\
 $$MVN3$$ install:install-file -DgroupId=android.support \
 -DartifactId=compatibility-v13 -Dversion=13 -Dpackaging=jar \
--Dfile=$$SDK$$/extras/android/support/v13/android-support-v13.jar,\
-bindir=upload/target
+-Dfile=$$SDK$$/extras/android/support/v13/android-support-v13.jar
+
 Build Version:1.5.3,5000,!for UCM purposes,subdir=upload
 
 Auto Update Mode:None
diff --git a/metadata/net.dahanne.android.regalandroid.txt b/metadata/net.dahanne.android.regalandroid.txt
index a4784dbaca..c28e061d3b 100644
--- a/metadata/net.dahanne.android.regalandroid.txt
+++ b/metadata/net.dahanne.android.regalandroid.txt
@@ -19,7 +19,7 @@ Repo Type:git
 Repo:git://github.com/anthonydahanne/ReGalAndroid.git
 
 Build Version:1.1.2,5,9ec774b,\
-maven=yes,bindir=regalandroid/target,extlibs=filedrop/filedrop.jar,\
+maven=yes,extlibs=filedrop/filedrop.jar,\
 patch=g2.patch,prebuild=sed -i 's/1.0.0/2.0.0/g' g2-java-client/pom.xml && \
 sed -i 's/1.0.0/2.0.0/g' jiwigo-ws-api-converter/pom.xml && \
 sed -i '26\,30d;54\,78d' regalandroid-parent/pom.xml && \
diff --git a/metadata/net.nightwhistler.pageturner.txt b/metadata/net.nightwhistler.pageturner.txt
index d6d2a0c404..ef595a6f06 100644
--- a/metadata/net.nightwhistler.pageturner.txt
+++ b/metadata/net.nightwhistler.pageturner.txt
@@ -72,7 +72,6 @@ Build:2.0.7,24
 Build:2.0.8,25
     commit=2.0.8
     maven=yes
-    bindir=target
 
 Build:2.2.1,56
     commit=2.2.1
diff --git a/metadata/org.andglkmod.hunkypunk.txt b/metadata/org.andglkmod.hunkypunk.txt
index 8c9d4ecb57..f95598e0d2 100644
--- a/metadata/org.andglkmod.hunkypunk.txt
+++ b/metadata/org.andglkmod.hunkypunk.txt
@@ -28,21 +28,22 @@ Hunky Punk, created by Rafał Rzepecki, which hasn't been updated in a while.
 Repo Type:git
 Repo:https://code.google.com/p/hunkypunk
 
-Build Version:0.3,1,14ecc2a0d37c,bindir=alt-apk/mod/bin,init=rm ant.properties,prebuild=\
+Build Version:0.3,1,14ecc2a0d37c,update=force,init=rm ant.properties,prebuild=\
 echo "bash-location=/bin/sh" >> local.properties && \
 sed -i '68d' build.xml && \
 cd jni/nitfol && bison -o inform.c inform.y,buildjni=no,antcommand=mod-release
 
 Build:0.8,6
+    forceversion=yes
+    forcevercode=yes
     commit=744b8c26032
     rm=ant.properties
-    prebuild=sed -i '139,140d' build.xml && \
-        echo "bash-location=/bin/bash" >> local.properties && \
-        cd jni/nitfol && \
-        bison -o inform.c inform.y
+    prebuild=(cd jni/nitfol && \
+        bison -o inform.c inform.y) && \
+        chmod ug+x fix-mod.sh && \
+        ./fix-mod.sh
     buildjni=no
-    bindir=alt-apk/mod4/bin
-    antcommand=mod4-release
+    update=force
 
 Auto Update Mode:None
 Update Check Mode:None
diff --git a/metadata/org.example.pushupbuddy.txt b/metadata/org.example.pushupbuddy.txt
index b2ed7c38ae..616a67c568 100644
--- a/metadata/org.example.pushupbuddy.txt
+++ b/metadata/org.example.pushupbuddy.txt
@@ -13,7 +13,7 @@ Uses the proximity sensor of your phone to log your push-up workout.
 Repo Type:bzr
 Repo:lp:~rheo/pushupbuddy/trunk
 
-Build Version:1.0,1,1,bindir=bin/,oldsdkloc=yes
+Build Version:1.0,1,1,oldsdkloc=yes
 
 Auto Update Mode:None
 Update Check Mode:Static
diff --git a/metadata/org.gitorious.jamesjrh.isokeys.txt b/metadata/org.gitorious.jamesjrh.isokeys.txt
index 8366a2e972..2f158688d9 100644
--- a/metadata/org.gitorious.jamesjrh.isokeys.txt
+++ b/metadata/org.gitorious.jamesjrh.isokeys.txt
@@ -34,7 +34,7 @@ If anyone can help out with MIDI support please check out:
 Repo Type:git
 Repo:git://gitorious.org/hexiano/hexiano.git
 
-Build Version:0.82.1 ALPHA,14,a2dad34,bindir=Hexiano/build/bin/,subdir=Hexiano,target=android-10,\
+Build Version:0.82.1 ALPHA,14,a2dad34,subdir=Hexiano,target=android-10,\
 prebuild=git checkout build.xml && echo "app.packagename=org.gitorious.jamesjrh.isokeys" >> \
 local.properties && ant filter-package
 
diff --git a/metadata/org.quantumbadger.redreader.txt b/metadata/org.quantumbadger.redreader.txt
index 0871563e83..2b831d033e 100644
--- a/metadata/org.quantumbadger.redreader.txt
+++ b/metadata/org.quantumbadger.redreader.txt
@@ -34,21 +34,21 @@ directly.
 Repo Type:git
 Repo:https://github.com/QuantumBadger/RedReader
 
-Build Version:1.4.0,15,v1.4.0,maven=yes,bindir=target,target=android-16
-Build Version:1.4.2,17,v1.4.2,maven=yes,bindir=target,target=android-16
-Build Version:1.5.1,21,v1.5.1,maven=yes,bindir=target,target=android-16
-Build Version:1.5.2,22,v1.5.2,maven=yes,bindir=target,target=android-16
-Build Version:1.6.2,25,v1.6.2,maven=yes,bindir=target,target=android-16
-Build Version:1.6.5,28,v1.6.5,maven=yes,bindir=target,target=android-16
-Build Version:1.6.8,32,v1.6.8,maven=yes,bindir=target,target=android-17
-Build Version:1.6.9,33,v1.6.9,maven=yes,bindir=target,target=android-17
-Build Version:1.7.0,34,v1.7.0,maven=yes,bindir=target,target=android-17
-Build Version:1.7.2,36,v1.7.2,maven=yes,bindir=target,target=android-17
-Build Version:1.7.4,38,v1.7.4,maven=yes,bindir=target,target=android-17
-Build Version:1.7.5,39,v1.7.5,maven=yes,bindir=target,target=android-17
-Build Version:1.8.0,40,v1.8.0,maven=yes,bindir=target,target=android-17
-Build Version:1.8.2,42,v1.8.2,maven=yes,bindir=target,target=android-17
-Build Version:1.8.3,43,v1.8.3,maven=yes,bindir=target,target=android-17
+Build Version:1.4.0,15,v1.4.0,maven=yes,target=android-16
+Build Version:1.4.2,17,v1.4.2,maven=yes,target=android-16
+Build Version:1.5.1,21,v1.5.1,maven=yes,target=android-16
+Build Version:1.5.2,22,v1.5.2,maven=yes,target=android-16
+Build Version:1.6.2,25,v1.6.2,maven=yes,target=android-16
+Build Version:1.6.5,28,v1.6.5,maven=yes,target=android-16
+Build Version:1.6.8,32,v1.6.8,maven=yes,target=android-17
+Build Version:1.6.9,33,v1.6.9,maven=yes,target=android-17
+Build Version:1.7.0,34,v1.7.0,maven=yes,target=android-17
+Build Version:1.7.2,36,v1.7.2,maven=yes,target=android-17
+Build Version:1.7.4,38,v1.7.4,maven=yes,target=android-17
+Build Version:1.7.5,39,v1.7.5,maven=yes,target=android-17
+Build Version:1.8.0,40,v1.8.0,maven=yes,target=android-17
+Build Version:1.8.2,42,v1.8.2,maven=yes,target=android-17
+Build Version:1.8.3,43,v1.8.3,maven=yes,target=android-17
 
 Auto Update Mode:None
 Update Check Mode:Tags
diff --git a/metadata/org.scummvm.scummvm.txt b/metadata/org.scummvm.scummvm.txt
index 3a3c253e44..8d7f3970c8 100644
--- a/metadata/org.scummvm.scummvm.txt
+++ b/metadata/org.scummvm.scummvm.txt
@@ -32,7 +32,7 @@ Repo Type:git
 Repo:git://github.com/scummvm/scummvm.git
 
 Build Version:1.5.0,6,v1.5.0,extlibs=libmad/libmad-0.15.1b.tar.gz,srclibs=FLAC@1.2.1;Tremor@18154,\
-update=no,patch=fdroid_build.patch;latest_sdk.patch;jdk7.patch,bindir=.,antcommand="-p",\
+update=no,patch=fdroid_build.patch;latest_sdk.patch;jdk7.patch,antcommand="-p",\
 init=echo -e '<project>\n<target name="Creating scummvm.apk for release..."/>\n</project>' > build.xml,\
 prebuild=\
   set -- $$SDK$$/build-tools/*/aapt && \
diff --git a/metadata/org.subsurface.txt b/metadata/org.subsurface.txt
index d4c18063d8..699e95f5b6 100644
--- a/metadata/org.subsurface.txt
+++ b/metadata/org.subsurface.txt
@@ -17,7 +17,7 @@ Companion app for the cross-platform Subsurface desktop app
 Repo Type:git
 Repo:git://subsurface.hohndel.org/subsurface-companion.git
 
-Build Version:1.7,8,1.7,maven=yes,bindir=target,prebuild=\
+Build Version:1.7,8,1.7,maven=yes,prebuild=\
 sed -i '/sherlock/d' project.properties
 
 Auto Update Mode:None
diff --git a/metadata/org.wikimedia.commons.txt b/metadata/org.wikimedia.commons.txt
index a74ef0b028..b68406fff5 100644
--- a/metadata/org.wikimedia.commons.txt
+++ b/metadata/org.wikimedia.commons.txt
@@ -20,19 +20,19 @@ Repo Type:git
 Repo:https://github.com/wikimedia/apps-android-commons
 
 Build Version:1.0beta7,8,v1.0beta7,subdir=commons,target=android-15,maven=yes,\
-bindir=commons/target,prebuild=rm -rf jni && sed -i 's/test/commons/' \
+prebuild=rm -rf jni && sed -i 's/test/commons/' \
 src/main/java/org/wikimedia/commons/CommonsApplication.java && \
 sed -i '/tracking_summary/{N;s/true/false/}' res/xml/preferences.xml
 Build Version:1.0beta8,9,v1.0beta8,subdir=commons,target=android-15,maven=yes,\
-bindir=commons/target,prebuild=rm -rf jni && sed -i 's/test/commons/' \
+prebuild=rm -rf jni && sed -i 's/test/commons/' \
 src/main/java/org/wikimedia/commons/CommonsApplication.java && \
 sed -i '/tracking_summary/{N;s/true/false/}' res/xml/preferences.xml
 Build Version:1.0beta11,12,v1.0beta11,subdir=commons,target=android-15,maven=yes,\
-bindir=commons/target,prebuild=rm -rf jni && sed -i 's/test/commons/' \
+prebuild=rm -rf jni && sed -i 's/test/commons/' \
 src/main/java/org/wikimedia/commons/CommonsApplication.java && \
 sed -i '/tracking_summary/{N;s/true/false/}' res/xml/preferences.xml
 Build Version:1.0beta13,14,v1.0beta13,subdir=commons,target=android-17,maven=yes,\
-bindir=commons/target,prebuild=rm -rf jni && sed -i 's/test/commons/' \
+prebuild=rm -rf jni && sed -i 's/test/commons/' \
 src/main/java/org/wikimedia/commons/CommonsApplication.java && \
 sed -i '/tracking_summary/{N;s/true/false/}' res/xml/preferences.xml
 
diff --git a/metadata/org.yaaic.txt b/metadata/org.yaaic.txt
index 798180d989..ee5420a08c 100644
--- a/metadata/org.yaaic.txt
+++ b/metadata/org.yaaic.txt
@@ -15,10 +15,10 @@ Repo Type:git
 Repo:https://github.com/pocmo/Yaaic.git
 
 #Last binary version...
-#Build Version:0.6.1,8,4d04ca810df9f859d8e5,subdir=application,bindir=builds/ant
-Build Version:0.7,9,v0.7,subdir=application,bindir=builds/ant
-Build Version:0.8,10,v0.8,subdir=application,bindir=builds/ant
-Build Version:0.9,11,v0.9,subdir=application,bindir=builds/ant
+#Build Version:0.6.1,8,4d04ca810df9f859d8e5,subdir=application,init=rm -f build.properties
+Build Version:0.7,9,v0.7,subdir=application,init=rm -f build.properties
+Build Version:0.8,10,v0.8,subdir=application,init=rm -f build.properties
+Build Version:0.9,11,v0.9,subdir=application,init=rm -f build.properties
 Build Version:1.0,12,v1.0,subdir=application
 
 Auto Update Mode:None