diff --git a/metadata/at.tomtasche.reader.txt b/metadata/at.tomtasche.reader.txt
index 77872080b7..410553cd55 100644
--- a/metadata/at.tomtasche.reader.txt
+++ b/metadata/at.tomtasche.reader.txt
@@ -63,6 +63,20 @@ cp aFileChooser/aFileChooser/libs/android-support-v4.jar ActionBarSherlock/libra
 build=cd odf2html/library/ && ant -f dep/commons/library/build.xml && \
 mkdir -p lib/ && mv dep/commons/library/commons.jar lib/ && \
 cp lib/commons.jar ../../libs/ && ant && mv odf2html.jar ../../libs/
+Build Version:2.0.8.2,37,v2.0.8.2,submodules=no,init=\
+rm -rf odf2html/.gitmodules odf2html/library/dep/commons && git submodule update --init && \
+git clone git://github.com/andiwand/commons.git odf2html/library/dep/commons && \
+cd odf2html/ && git checkout a7405 && rm -rf $(find . -name bin) && rm -rf $(find . -name gen),\
+srclibs=MobAdMob@2d5736,update=.;aFileChooser/aFileChooser;ActionBarSherlock/library;\
+AndroidBillingLibrary/AndroidBillingLibrary;Android-AppMsg/library,prebuild=\
+echo "source.dir=src;$$MobAdMob$$/src" >> project.properties && \
+rm -rf libs/GoogleAdMobAdsSdk*.jar OpenDocument.apk \
+libs/android-support-v4.jar odf2html/library/odf2html.jar && \
+cp aFileChooser/aFileChooser/libs/android-support-v4.jar filepicker-android/libs/ && \
+cp aFileChooser/aFileChooser/libs/android-support-v4.jar ActionBarSherlock/library/libs/,\
+build=cd odf2html/library/ && ant -f dep/commons/library/build.xml && \
+mkdir -p lib/ && mv dep/commons/library/commons.jar lib/ && \
+cp lib/commons.jar ../../libs/ && ant && mv odf2html.jar ../../libs/
 
 Auto Update Mode:None
 #Device-variable; don't want to nuke submodules with Tags
diff --git a/metadata/com.hyperionics.fbreader.plugin.tts_plus.txt b/metadata/com.hyperionics.fbreader.plugin.tts_plus.txt
index 964ae87fc7..3336598f09 100644
--- a/metadata/com.hyperionics.fbreader.plugin.tts_plus.txt
+++ b/metadata/com.hyperionics.fbreader.plugin.tts_plus.txt
@@ -29,8 +29,9 @@ Build Version:2.0.0,2000000,e26ac107c,target=android-15,rm=TtsPlus-FBReader.apk,
 prebuild=sed -i -e '/proguard/d' project.properties
 Build Version:2.0.3,2000030,fc95b396a4,target=android-15,rm=TtsPlus-FBReader.apk,\
 prebuild=sed -i -e '/proguard/d' project.properties
+Build Version:2.0.4,2000040,d186f9bf69,target=android-15,rm=TtsPlus-FBReader.apk,\
+prebuild=sed -i -e '/proguard/d' project.properties
 
-# 2.0.1 starts using an amazon appstore lib and code
 Auto Update Mode:None
 Update Check Mode:RepoManifest
 Current Version:2.0.4
diff --git a/metadata/com.sigseg.android.worldmap.txt b/metadata/com.sigseg.android.worldmap.txt
index 219d02a392..4c5d923333 100644
--- a/metadata/com.sigseg.android.worldmap.txt
+++ b/metadata/com.sigseg.android.worldmap.txt
@@ -21,7 +21,8 @@ just what it needs to display.
 Repo Type:git
 Repo:https://github.com/johnnylambada/WorldMap.git
 
-Build Version:2.0.2,5,version-2.0.2,subdir=worldmap,prebuild=rm -rf release && mkdir src
+Build Version:2.0.2,5,version-2.0.2,subdir=worldmap,update=.;../library,\
+prebuild=rm -rf release && mkdir src
 
 Auto Update Mode:None
 Update Check Mode:Tags
diff --git a/metadata/com.ubergeek42.WeechatAndroid.txt b/metadata/com.ubergeek42.WeechatAndroid.txt
index ea4d008d4e..f8c4968880 100644
--- a/metadata/com.ubergeek42.WeechatAndroid.txt
+++ b/metadata/com.ubergeek42.WeechatAndroid.txt
@@ -27,10 +27,10 @@ sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.p
 sed -i 's@\(android.library.reference.2=\).*@\1$$ViewPagerIndicator$$@' project.properties && \
 mvn clean package -f ../weechat-relay/pom.xml && mkdir -p libs/ && \
 mv ../weechat-relay/target/weechat-relay-0.8-SNAPSHOT.jar libs/
-Build Version:0.8-dev-b5,5,!enable when released v0.08-dev-b5,maven=yes,bindir=weechat-android/target
+Build Version:0.8-dev-b5,5,b484867803,maven=yes,bindir=weechat-android/target
 
 Auto Update Mode:None
-Update Check Mode:Tags
-Current Version:0.8-dev-b4
-Current Version Code:4
+Update Check Mode:RepoManifest
+Current Version:0.8-dev-b5
+Current Version Code:5
 
diff --git a/metadata/net.momodalo.app.vimtouch.txt b/metadata/net.momodalo.app.vimtouch.txt
index 9406c4dca4..f96f71ce40 100644
--- a/metadata/net.momodalo.app.vimtouch.txt
+++ b/metadata/net.momodalo.app.vimtouch.txt
@@ -25,8 +25,10 @@ Build Version:1.7,17,v1.7,buildjni=yes,prebuild=\
 sed -i 's@$SDK@$$SDK$$@g' prepare-clean-checkout.sh && ./prepare-clean-checkout.sh
 Build Version:2.1,21,v2.1,prebuild=\
 sed -i 's@$SDK@$$SDK$$@g' prepare-clean-checkout.sh && ./prepare-clean-checkout.sh,buildjni=no
-#Build Version:2.3,25,v2.3,buildjni=no,prebuild=\
-#sed -i 's@$SDK@$$SDK$$@g' prepare-clean-checkout.sh && ./prepare-clean-checkout.sh
+Build Version:2.3,25,v2.3,buildjni=no,extlibs=android/android-support-v4.jar,prebuild=\
+mkdir -p libraries/aFileChooser/libs/ && mv libs/*-v4.jar libraries/aFileChooser/libs/ && \
+sed -i 's@$SDK@$$SDK$$@g' prepare-clean-checkout.sh && \
+sed -i 's/FileExplorer/aFileChooser/g' prepare-clean-checkout.sh && ./prepare-clean-checkout.sh
 
 Auto Update Mode:None
 Update Check Mode:Tags
diff --git a/metadata/org.fdroid.superuser.txt b/metadata/org.fdroid.superuser.txt
index 729be062b3..bdb96ec40a 100644
--- a/metadata/org.fdroid.superuser.txt
+++ b/metadata/org.fdroid.superuser.txt
@@ -41,9 +41,15 @@ echo "android.jar=$$SDK$$/platforms/android-17/android.jar" > ant.properties &&
 sed -i 's@\(android.library.reference.1=\).*@\1$$KoushWidgets$$@' project.properties && \
 sed -i 's/#define REQUESTOR JAVA_PACKAGE_NAME/#define REQUESTOR "org.fdroid.superuser"/g' jni/su/su.h && \
 sed -i 's/NDK_TOOLCHAIN_VERSION=4.7/NDK_TOOLCHAIN_VERSION=4.6/g' jni/Application.mk,buildjni=yes
+Build Version:1.0.1.6,1016,2be82fa09,subdir=Superuser,patch=about.patch;packageid.patch,\
+srclibs=KoushWidgets@ddc30339c3,prebuild=\
+echo "android.jar=$$SDK$$/platforms/android-17/android.jar" > ant.properties && \
+sed -i 's@\(android.library.reference.1=\).*@\1$$KoushWidgets$$@' project.properties && \
+sed -i 's/#define REQUESTOR JAVA_PACKAGE_NAME/#define REQUESTOR "org.fdroid.superuser"/g' jni/su/su.h && \
+sed -i 's/NDK_TOOLCHAIN_VERSION=4.7/NDK_TOOLCHAIN_VERSION=4.6/g' jni/Application.mk,buildjni=yes
 
 Auto Update Mode:None
 Update Check Mode:None
-Current Version:1.0.1.3
-Current Version Code:1013
+Current Version:1.0.1.6
+Current Version Code:1016