diff --git a/metadata/com.googlecode.networklog.txt b/metadata/com.googlecode.networklog.txt
index 309afafd22..5704876813 100644
--- a/metadata/com.googlecode.networklog.txt
+++ b/metadata/com.googlecode.networklog.txt
@@ -38,40 +38,43 @@ Build Version:2.14.0,21400,2.14.0,buildjni=no,rm=libs/android-support-v4.jar,upd
 Build Version:2.15.0,21500,2.15.0,buildjni=no,update=.;ActionBarSherlock/library;ViewPagerIndicator/library,rm=libs/android-support-v4.jar
 Build Version:2.16.0,21600,2.16.0,buildjni=no,rm=libs/android-support-v4.jar,update=.;ActionBarSherlock/library;ViewPagerIndicator/library
 Build Version:2.17.0,21700,2.17.0,buildjni=no,update=.;ActionBarSherlock/library;ViewPagerIndicator/library,rm=libs/android-support-v4.jar
-# Using alternative iptables source still leads to fdroid errors for non-armeabi
-Build Version:x,0,!fdroid errors; ndk-build works fine (at x),\
-update=.;ActionBarSherlock/library;ViewPagerIndicator/library,prebuild=\
-rm libs/android*.jar && cd jni && rm -rf iptables && \
-wget https://hg.adblockplus.org/adblockplusandroid/raw-file/d7c96f2212b1/iptables.patch && \
-git clone https://android.googlesource.com/platform/external/iptables && \
-cd iptables && git apply ../iptables.patch && \
-make fixextensions,build=$$NDK$$/ndk-build && \
-mv libs/armeabi/grep libs/armeabi/grep_armv5 && \
-zip res/raw/grep_armv5.zip libs/armeabi/grep_armv5 && \
-mv libs/armeabi/nflog libs/armeabi/nflog_armv5 && \
-zip res/raw/nflog_armv5.zip libs/armeabi/nflog_armv5 && \
-mv libs/armeabi/iptables libs/armeabi/iptables_armv5 && \
-zip res/raw/iptables_armv5.zip libs/armeabi/iptables_armv5 && \
-mv libs/armeabi-v7a/grep libs/armeabi-v7a/grep_armv7 && \
-zip res/raw/grep_armv7.zip libs/armeabi/grep_armv7 && \
-mv libs/armeabi-v7a/iptables libs/armeabi-v7a/iptables_armv7 && \
-zip res/raw/iptables_armv7.zip libs/armeabi/iptables_armv7 && \
-mv libs/armeabi-v7a/nflog libs/armeabi-v7a/nflog_armv7 && \
-zip res/raw/nflog_armv7.zip libs/armeabi/nflog_armv7 && \
-mv libs/mips/grep libs/mips/grep_mips && \
-zip res/raw/grep_mips.zip libs/armeabi/grep_mips && \
-mv libs/mips/iptables libs/mips/iptables_mips && \
-zip res/raw/iptables_mips.zip libs/armeabi/iptables_mips && \
-mv libs/mips/nflog libs/mips/nflog_mips && \
-zip res/raw/nflog_mips.zip libs/armeabi/nflog_mips && \
-mv libs/x86/grep libs/x86/grep_x86 && \
-zip res/raw/grep_x86.zip libs/armeabi/grep_x86 && \
-mv libs/x86/iptables libs/x86/iptables_x86 && \
-zip res/raw/iptables_x86.zip libs/armeabi/iptables_x86 && \
-mv libs/x86/nflog libs/x86/nflog_x86 && \
-zip res/raw/nflog_x86.zip libs/armeabi/nflog_x86 && \
-rm -rf libs/armeabi libs/armeabi-v7a libs/mips libs/x86,buildjni=no
 Build Version:2.18.0,21800,2.18.0,buildjni=no,rm=libs/android-support-v4.jar,update=.;ActionBarSherlock/library;ViewPagerIndicator/library
+# Using alternative iptables source still leads to fdroid errors for non-armeabi
+Build Version:2.18.1,21801,2.18.0,\
+update=.;ActionBarSherlock/library;ViewPagerIndicator/library,\
+target=android-15,\
+prebuild=rm libs/android*.jar && cd jni/ && rm -rf iptables && \
+         wget https://hg.adblockplus.org/adblockplusandroid/raw-file/d7c96f2212b1/iptables.patch && \
+         git clone https://android.googlesource.com/platform/external/iptables && \
+         cd iptables && git apply ../iptables.patch && \
+         make fixextensions,\
+build=$$NDK$$/ndk-build && \
+      mv libs/armeabi/grep libs/armeabi/grep_armv5 && \
+      zip res/raw/grep_armv5.zip libs/armeabi/grep_armv5 && \
+      mv libs/armeabi/nflog libs/armeabi/nflog_armv5 && \
+      zip res/raw/nflog_armv5.zip libs/armeabi/nflog_armv5 && \
+      mv libs/armeabi/iptables libs/armeabi/iptables_armv5 && \
+      zip res/raw/iptables_armv5.zip libs/armeabi/iptables_armv5 && \
+      mv libs/armeabi-v7a/grep libs/armeabi-v7a/grep_armv7 && \
+      zip res/raw/grep_armv7.zip libs/armeabi/grep_armv7 && \
+      mv libs/armeabi-v7a/iptables libs/armeabi-v7a/iptables_armv7 && \
+      zip res/raw/iptables_armv7.zip libs/armeabi/iptables_armv7 && \
+      mv libs/armeabi-v7a/nflog libs/armeabi-v7a/nflog_armv7 && \
+      zip res/raw/nflog_armv7.zip libs/armeabi/nflog_armv7 && \
+      mv libs/mips/grep libs/mips/grep_mips && \
+      zip res/raw/grep_mips.zip libs/armeabi/grep_mips && \
+      mv libs/mips/iptables libs/mips/iptables_mips && \
+      zip res/raw/iptables_mips.zip libs/armeabi/iptables_mips && \
+      mv libs/mips/nflog libs/mips/nflog_mips && \
+      zip res/raw/nflog_mips.zip libs/armeabi/nflog_mips && \
+      mv libs/x86/grep libs/x86/grep_x86 && \
+      zip res/raw/grep_x86.zip libs/armeabi/grep_x86 && \
+      mv libs/x86/iptables libs/x86/iptables_x86 && \
+      zip res/raw/iptables_x86.zip libs/armeabi/iptables_x86 && \
+      mv libs/x86/nflog libs/x86/nflog_x86 && \
+      zip res/raw/nflog_x86.zip libs/armeabi/nflog_x86 && \
+      rm -rf libs/armeabi libs/armeabi-v7a libs/mips libs/x86,\
+buildjni=no
 
 Auto Update Mode:Version %v
 Update Check Mode:Tags