diff --git a/metadata/org.adaway.txt b/metadata/org.adaway.txt
index b692c87d09..56ba9ea902 100644
--- a/metadata/org.adaway.txt
+++ b/metadata/org.adaway.txt
@@ -60,6 +60,7 @@ echo "android.library.reference.4=android-libs/HtmlSpanner/htmlspanner" >> proje
 find . -type f -print0 | xargs -0 sed -i 's/org.rootcommands/org.sufficientlysecure.rootcommands/g' && \
 cp android-libs/Donations/ant-templates/other/DonationsConfig.java \
 android-libs/Donations/src/org/donations/,buildjni=yes
+
 #RootCommands srclib needs changing on fdroidserver
 Build Version:2.3,42,v2.3,subdir=AdAway,srclibs=RootCommands@c940b0e503,\
 extlibs=htmlcleaner/htmlcleaner-2.2.jar,init=rm android-libs/Donations/custom_rules.xml && \
@@ -74,8 +75,22 @@ find . -type f -print0 | xargs -0 sed -i 's/org.rootcommands/org.sufficientlysec
 cp android-libs/Donations/ant-templates/other/DonationsConfig.java \
 android-libs/Donations/src/org/donations/,buildjni=yes
 
-Build Version:2.5,44,!WIP at v2.5,subdir=AdAway,buildjni=yes,gradle=yes@..,preassemble=renameExecutables,\
-patch=no-signing-44.patch
+Build Version:2.5,44,!WIP at v2.5,subdir=AdAway,\
+init=rm libs/*,\
+patch=no-signing-44.patch,\
+extlibs=htmlcleaner/htmlcleaner-2.2.jar,\
+srclibs=RootCommands@a89cc259;HtmlSpanner-dscuermann@f6907a1c46,\
+prebuild=sed -i 's/armeabi x86 mips/armeabi x86 mips/g' jni/Application.mk && \
+         cp -r $$RootCommands$$ ../libraries/ && \
+         cp -r $$HtmlSpanner-dscuermann$$ ../libraries/ && \
+         cp libs/htmlcleaner-2.2.jar ../libraries/htmlspanner/libs/,\
+build=ant clean release -f ../libraries/RootCommands-Library/build.xml && \
+      mv ../libraries/RootCommands-Library/bin/classes.jar libs/root-commands-master.jar && \
+      ant clean release -f ../libraries/htmlspanner/build.xml && \
+      mv ../libraries/htmlspanner/bin/classes.jar libs/htmlspanner-0.2-fork.jar,\
+buildjni=yes,\
+preassemble=renameExecutables,\
+gradle=yes@..
 
 Auto Update Mode:None
 Update Check Mode:Tags