diff --git a/metadata/org.adblockplus.android.txt b/metadata/org.adblockplus.android.txt
index 981ca3e14d..70c40ded28 100644
--- a/metadata/org.adblockplus.android.txt
+++ b/metadata/org.adblockplus.android.txt
@@ -8,7 +8,7 @@ Issue Tracker:https://adblockplus.org/forum/viewforum.php?f=11
 Donate:http://adblockplus.org/en/contribute#donate
 FlattrID:454073
 
-Auto Name:Adblock Plus
+Auto Name:Astroboy
 Summary:Ad blocker
 Description:
 '''N.B''' If you get a http error 400 when updating the F-Droid client, it is
@@ -58,7 +58,7 @@ Build:1.1,238
     commit=1.1
     init=rm -rf iptables/ libs/* obj/ build.xml && \
         git clone https://android.googlesource.com/platform/external/iptables
-    update=.;submodules/actionbarsherlock/library;submodules/android-switch-backport
+    update=.,submodules/actionbarsherlock/library,submodules/android-switch-backport
     srclibs=RootTools@1.7
     prebuild=echo "source.dir=src;$$RootTools$$/src" >> ant.properties && \
         cd iptables && \
@@ -72,7 +72,7 @@ Build:1.1.1,248
     commit=1.1.1
     init=rm -rf iptables/ libs/* obj/ build.xml && \
         git clone https://android.googlesource.com/platform/external/iptables
-    update=.;submodules/actionbarsherlock/library;submodules/android-switch-backport
+    update=.,submodules/actionbarsherlock/library,submodules/android-switch-backport
     srclibs=RootTools@1.7
     prebuild=echo "source.dir=src;$$RootTools$$/src" >> ant.properties && \
         cd iptables && \
@@ -84,7 +84,7 @@ Build:1.1.1,248
 
 Build:1.1.2,253
     commit=1.1.2
-    srclibs=RootTools@1.7;iptables@android-4.2.2_r1
+    srclibs=RootTools@1.7,iptables@android-4.2.2_r1
     prebuild=rm libs/RootTools-1.7.jar && \
         cp -r $$iptables$$ . && \
         echo "source.dir=src;$$RootTools$$/src" >> ant.properties && \
@@ -98,7 +98,7 @@ Build:1.1.2,253
 
 Build:1.1.3,270
     commit=1.1.3
-    srclibs=RootTools@1.7;iptables@android-4.2.2_r1
+    srclibs=RootTools@1.7,iptables@android-4.2.2_r1
     prebuild=rm libs/RootTools-1.7.jar && \
         cp -r $$iptables$$ . && \
         echo "source.dir=src;$$RootTools$$/src" >> ant.properties && \
@@ -111,36 +111,36 @@ Build:1.1.3,270
     buildjni=no
 
 Build:1.1.4,286
-    commit=1.1.4
     disable=blobs in jni
-    srclibs=RootTools@1.7;iptables@android-4.2.2_r1
-    scanignore=jni/v8
+    commit=1.1.4
+    srclibs=RootTools@1.7,iptables@android-4.2.2_r1
     prebuild=rm libs/RootTools-1.7.jar && \
         cp -r $$iptables$$ . && \
         echo "source.dir=src;$$RootTools$$/src" >> ant.properties && \
         cd iptables && \
         git apply ../iptables.patch && \
         python extensions/fixinit.py
+    scanignore=jni/v8
     build=cd iptables && \
         $$NDK$$/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk && \
         mv libs/armeabi/iptables ../assets/install/
     buildjni=no
 
 Build:1.2,307
-    commit=1.2
     disable=blobs in jni
-    srclibs=RootTools@1.7
-    scanignore=jni/v8
+    commit=1.2
+    rm=buildtools,libs/RootTools-1.7.jar,assets/install/iptables
     extlibs=iptables-script_1.4.20.zip
-    rm=buildtools;libs/RootTools-1.7.jar;assets/install/iptables
+    srclibs=RootTools@1.7
     prebuild=sed -i 's/android-7/android-8/' build.xml && \
         echo "source.dir=src;$$RootTools$$/src" >> ant.properties && \
-	echo "ndk.dir=$$NDK$$" >> local.properties && \
+        echo "ndk.dir=$$NDK$$" >> local.properties && \
         unzip libs/iptables-script_1.4.20.zip && \
         sed -i 's/arm x86 mips/arm/g' external/Makefile && \
         rm libs/iptables-script_1.4.20.zip
+    scanignore=jni/v8
     build=make -C external NDK=$$NDK$$ && \
-          mv external/iptables_arm assets/install/iptables
+        mv external/iptables_arm assets/install/iptables
     buildjni=no
 
 Maintainer Notes: