diff --git a/metadata/net.i2p.android.router.txt b/metadata/net.i2p.android.router.txt
index 19513d80a8..b4d86b9534 100644
--- a/metadata/net.i2p.android.router.txt
+++ b/metadata/net.i2p.android.router.txt
@@ -8,6 +8,7 @@ Litecoin:LM7DTXGHBzh7xeo7ZSWR6hs9s4oVAUsw4E
 FlattrID:13523
 Donate:https://geti2p.net/en/get-involved/donate
 
+Auto Name:I2P
 Summary:I2P anonymous network
 Description:
 I2P is an anonymizing network, offering a simple layer that identity-sensitive
@@ -70,29 +71,15 @@ Build:0.9.9-0_b1-API8,4737024
 
 Build:0.9.12-0_b1-API8,4743168
     commit=30d1816c431e98182f2438e4f0c17e8c0089f71b
-    srclibs=I2P@90cd68900e75dfb8ae1fd7c3255393aea09d5ceb
-    update=no
-    scanignore=./appcompat/libs/,./libs/
-    prebuild=sed -i '49s|export NDK="`readlink -n -e $(for last in $NDK_GLOB; do true; done ; echo $last)`"|export NDK=$$NDK$$|' ./routerjars/jni/build.sh && \
-        sed -i '48d' ./routerjars/jni/build.sh && \
-        cp -R $$I2P$$* ./i2p.i2p && \
-        echo -e "\nsdk.dir=$$SDK$$" >> ./local.properties && \
-        echo -e "\nsdk.dir=$$SDK$$" >> ./routerjars/local.properties && \
-        echo -e "\nndk.dir=$$NDK$$" >> ./routerjars/local.properties && \
-        echo -e "\ni2psrc=./i2p.i2p" >> ./local.properties && \
-        rm -R ./i2p.i2p/installer/lib/jbigi/* &&\
-        rm -R ./i2p.i2p/installer/lib/wrapper/* && \
-        rm -R ./i2p.i2p/installer/lib/launch4j/* && \
-        rm -R ./i2p.i2p/installer/lib/izpack/* && \
-        rm -R ./routerjars/jni/libjbigi.so && \
-        rm -R ./i2p.i2p/apps/jetty/* && \
-        rm -R ./i2p.i2p/apps/susidns/src/WEB-INF/lib/* && \
-        rm -R ./i2p.i2p/apps/jrobin/* && \
-        rm -R ./i2p.i2p/apps/systray/* && \
-        cp -R $$SDK$$/extras/android/support/v7/appcompat/ appcompat/ && \
-        echo -e "\nandroid.library.reference.2=./appcompat/" >> ./local.properties && \
-        $$SDK$$/tools/android update lib-project --path ./appcompat/ && \
-        echo -e "\ni2psrc=./../i2p.i2p" >> ./routerjars/local.properties && \
+    srclibs=I2P@90cd68900e75dfb8ae1fd7c3255393aea09d5ceb,2:Support/v7/appcompat@android-4.4.2_r2
+    extlibs=android/android-support-v4.jar
+    update=../srclib/Support/v7/appcompat
+    scandelete=i2p.i2p,routerjars/jni
+    prebuild=sed -i 's@export NDK=.*@export NDK=$$NDK$$@' ./routerjars/jni/build.sh && \
+        cp -R $$I2P$$ ./i2p.i2p && \
+        mv libs/android-support-v4.jar $$Support$$/libs/ && \
+        echo -e "sdk.dir=$$SDK$$\ni2psrc=./i2p.i2p" >> ./local.properties && \
+        echo -e "sdk.dir=$$SDK$$\nndk.dir=$$NDK$$\ni2psrc=./../i2p.i2p" >> ./routerjars/local.properties && \
         wget ftp://ftp.gmplib.org/pub/gmp-4.3.2/gmp-4.3.2.tar.bz2 && \
         tar xjvf gmp-4.* -C ./i2p.i2p/core/c/jbigi/ && \
         rm ./gmp-4.*
@@ -109,6 +96,9 @@ ANDROIDBUILD  4 bits 0-15
 See custom_rules.xml for more info.
 
 Increment build number for updates between router releases.
+
+Can't use neither update=auto (the default) nor any Update Check Mode, since
+it uses a weird ant setup that breaks any 'android update' runs.
 .
 
 Auto Update Mode:None