diff --git a/metadata/com.googlecode.droidwall.txt b/metadata/com.googlecode.droidwall.txt
index 0ee1c23939..ecaf25fb12 100644
--- a/metadata/com.googlecode.droidwall.txt
+++ b/metadata/com.googlecode.droidwall.txt
@@ -7,7 +7,7 @@ Issue Tracker:http://code.google.com/p/droidwall/issues/list
 Auto Name:DroidWall
 Summary:Firewall frontend
 Description:
-'''N.B'''Development of this app has ceased.
+'''N.B'''Development of this app ceased in mid 2012.
 
 Tap the tab at the top to switch between whitelist and blacklist mode.
 Tap Menu and Apply Changes to apply.
@@ -20,26 +20,30 @@ Requires root: Yes. iptables (the firewall itself) has to be run as root.
 Requires Root:Yes
 
 #The trunk is now (08-2012) empty but svn/tags/ is still populated
-Repo Type:svn
-Repo:http://droidwall.googlecode.com/svn/tags/v1.5.7
+Repo Type:git-svn
+Repo:http://droidwall.googlecode.com/svn;trunk=trunk;tags=tags
 
-Build Version:1.5.7,157,250,target=android-8,init=\
-rm -rf external/iptables && cd external && \
-git clone https://android.googlesource.com/platform/external/iptables,\
-patch=iptables.patch,srclibs=Busybox@83785f0;BusyboxConfigs@bd2bf4f3,prebuild=\
-rm -rf res/raw/busybox_g1 res/raw/iptables_armv5 external/busybox && \
-sed -i 's/android:minSdkVersion=\"3\"/android:minSdkVersion=\"4\" \
-android:maxSdkVersion=\"10\"/g' AndroidManifest.xml && \
-cp $$BusyboxConfigs$$/android_ndk_defconfigPlus $$Busybox$$/.config,build=\
-export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:$PATH && \
-make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" -C $$Busybox$$ && \
-mv $$Busybox$$/busybox res/raw/busybox_g1 && \
-cd external/iptables && python extensions/fixinit.py && \
-$$NDK$$/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk && \
-mv libs/armeabi/iptables ../../res/raw/iptables_armv5
+Build:1.5.7,157
+    commit=250
+    init=rm -rf external/iptables && \
+        cd external && \
+        git clone https://android.googlesource.com/platform/external/iptables
+    target=android-8
+    srclibs=Busybox@83785f0;BusyboxConfigs@bd2bf4f3
+    patch=iptables.patch
+    prebuild=rm -rf res/raw/busybox_g1 res/raw/iptables_armv5 external/busybox && \
+        sed -i 's/android:minSdkVersion=\"3\"/android:minSdkVersion=\"4\" android:maxSdkVersion=\"10\"/g' AndroidManifest.xml && \
+        cp $$BusyboxConfigs$$/android_ndk_defconfigPlus $$Busybox$$/.config
+    build=export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:$PATH && \
+        make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" -C $$Busybox$$ && \
+        mv $$Busybox$$/busybox res/raw/busybox_g1 && \
+        cd external/iptables && \
+        python extensions/fixinit.py && \
+        $$NDK$$/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk && \
+        mv libs/armeabi/iptables ../../res/raw/iptables_armv5
 
 Auto Update Mode:None
-Update Check Mode:Static
+Update Check Mode:Tags
 Current Version:1.5.7
 Current Version Code:157
 
diff --git a/metadata/net.androgames.level.txt b/metadata/net.androgames.level.txt
index e66e27cd86..c9af405d65 100644
--- a/metadata/net.androgames.level.txt
+++ b/metadata/net.androgames.level.txt
@@ -18,22 +18,24 @@ on a flat surface for a 360° level.
 * Roof pitch
 .
 
-#Repo Type:svn
-#Repo:http://androgames-sample.googlecode.com/svn/Market-apps/Level/trunk/
+# Repo Type:svn
+# Repo:http://androgames-sample.googlecode.com/svn/Market-apps/Level/trunk/
 Repo Type:git
 Repo:https://github.com/avianey/Level.git
 
-Build Version:1.8.0,27,75,update=force
-Build Version:1.9.0,29,79,update=force,target=android-11
-Build Version:1.9.2,31,81,target=android-11
-Build Version:1.9.3,32,84,target=android-11
-Build Version:1.9.4,33,a5e4dd671e,subdir=Level
+# Build Version:1.8.0,27,75,update=force
+# Build Version:1.9.0,29,79,update=force,target=android-11
+# Build Version:1.9.2,31,81,target=android-11
+# Build Version:1.9.3,32,84,target=android-11
+
+Build:1.9.4,33
+    commit=a5e4dd671e
+    subdir=Level
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.9.5
-Current Version Code:34
+Update Check Mode:RepoManifest
+Current Version:1.9.4
+Current Version Code:33
 
 No Source Since:1.9.5
 
diff --git a/metadata/net.sourceforge.servestream.txt b/metadata/net.sourceforge.servestream.txt
index 2d7efa7c11..f4b5b769df 100644
--- a/metadata/net.sourceforge.servestream.txt
+++ b/metadata/net.sourceforge.servestream.txt
@@ -24,69 +24,60 @@ if you find an audio file on a web page, share the link to Servestream.
 .
 
 #Repo:https://servestream.svn.sourceforge.net/svnroot/servestream/trunk; old url prior to r1160
+Repo Type:git-svn
+Repo:http://svn.code.sf.net/p/servestream/code;trunk=trunk;tags=tags
 
-#Repo Type:git-svn
-#Repo:http://svn.code.sf.net/p/servestream/code;trunk=trunk;tags=tags
+Build:0.5.4,69
+    commit=1354
+    srclibs=ActionBarSherlock@4.2.0
+    prebuild=rm custom_rules.xml && \
+        echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.properties && \
+        wget http://sourceforge.net/p/servestream/code/1175/tree/ffmpeg/ffmpeg-0.11.1-android-2012-09-18.tar.gz?format=raw --output-document=ffmpeg-0.11.1-android-2012-09-18.tar.gz && \
+        wget http://sourceforge.net/p/servestream/code/1311/tree/ffmpeg/scripts/arm-build.sh?format=raw --output-document=arm-build.sh && \
+        tar -xvf ffmpeg-0.11.1-android-2012-09-18.tar.gz && \
+        chmod +x arm-build.sh && \
+        mv arm-build.sh ffmpeg-0.11.1-android-2012-09-18 && \
+        sed -i 's/armeabi armeabi-v7a x86 mips/armeabi/g' jni/Application.mk && \
+        cd ffmpeg-0.11.1-android-2012-09-18 && \
+        ./extract.sh && \
+        sed -i 's/make -j4/make -j1/g' arm-build.sh && \
+        sed -i 's/bash/sh/g' arm-build.sh && \
+        sed -i '/PIPESTATUS/d' arm-build.sh && \
+        NDK=$$NDK$$ ./arm-build.sh && \
+        cp -r build/ffmpeg/* ../jni/ffmpeg/ffmpeg
+    buildjni=yes
 
-Repo Type:svn
-Repo:http://svn.code.sf.net/p/servestream/code/trunk
+Build:0.6.0,72
+    commit=v0.6.0
+    srclibs=ActionBarSherlock@4.2.0;DragSort@0.6.1
+    prebuild=sed -i 's/make -j4/make -j2/g' scripts/* && \
+        rm custom_rules.xml && \
+        chmod +x scripts/build-ffmpeg.sh && \
+        cp -f $$ActionBarSherlock$$/libs/android-support-v4.jar $$DragSort$$/libs/ && \
+        echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.properties && \
+        echo "android.library.reference.2=$$DragSort$$" >> project.properties
+    build=./scripts/build-ffmpeg.sh
+    buildjni=yes
 
-#Build Version:0.1,35,374,prebuild=mv lib/ libs/
-#Build Version:0.2.5,40,!source has wrong version code at r442,prebuild=mv lib/ libs/
-#The following is a guess at the correct revision. Most of the commits in
-#this project don't even have any comment at all!?
-#Build Version:0.2.11,46,614,prebuild=mv lib/ libs/
-#Still guessing, see previous comment
-#Build Version:0.3.1,48,659,prebuild=mv lib/ libs/
-#Build Version:0.4.4,54,957,prebuild=mv lib/ libs/
-#Build Version:0.4.6,56,999,prebuild=mv lib/ libs/
-#Build Version:0.4.7,57,1013,prebuild=mv lib/ libs/
-#Build Version:0.4.8,58,1031,prebuild=mv lib/ libs/
-#Build Version:0.4.9,59,1049,buildjni=no
-#Build Version:0.4.12,62,1160,buildjni=no
-Build Version:0.5.4,69,1354,srclibs=ActionBarSherlock@4.2.0,prebuild=\
-rm custom_rules.xml && echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.properties && \
-wget http://sourceforge.net/p/servestream/code/1175/tree/ffmpeg/ffmpeg-0.11.1-android-2012-09-18.tar.gz?\
-format=raw --output-document=ffmpeg-0.11.1-android-2012-09-18.tar.gz && \
-wget http://sourceforge.net/p/servestream/code/1311/tree/ffmpeg/scripts/arm-build.sh?\
-format=raw --output-document=arm-build.sh && \
-tar -xvf ffmpeg-0.11.1-android-2012-09-18.tar.gz && \
-chmod +x arm-build.sh && \
-mv arm-build.sh ffmpeg-0.11.1-android-2012-09-18 && \
-sed -i 's/armeabi armeabi-v7a x86 mips/armeabi/g' jni/Application.mk && \
-cd ffmpeg-0.11.1-android-2012-09-18 && ./extract.sh && \
-sed -i 's/make -j4/make -j1/g' arm-build.sh && \
-sed -i 's/bash/sh/g' arm-build.sh && \
-sed -i '/PIPESTATUS/d' arm-build.sh && \
-NDK=$$NDK$$ ./arm-build.sh && cp -r build/ffmpeg/* ../jni/ffmpeg/ffmpeg,buildjni=yes
-
-Build Version:0.6.0,72,v0.6.0,\
-srclibs=ActionBarSherlock@4.2.0;DragSort@0.6.1,prebuild=\
-sed -i 's/make -j4/make -j2/g' scripts/* && \
-rm custom_rules.xml && chmod +x scripts/build-ffmpeg.sh && \
-cp -f $$ActionBarSherlock$$/libs/android-support-v4.jar $$DragSort$$/libs/ && \
-echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.properties && \
-echo "android.library.reference.2=$$DragSort$$" >> project.properties,\
-build=./scripts/build-ffmpeg.sh,buildjni=yes
-
-Build Version:0.6.3,78,r1502,\
-srclibs=ActionBarSherlock@4.2.0;DragSort@0.6.1;Streamscraper@f01d9ac64629;Jericho@3.2,\
-prebuild=cp -f $$ActionBarSherlock$$/libs/android-support-v4.jar $$DragSort$$/libs/ && \
-         rm libs/streamscraper.jar && \
-         cp -r $$Streamscraper$$/src/net/moraleboost/ src/net/ && \
-         cp -r $$Jericho$$/src/java/net/htmlparser/ src/net/ && \
-         cp $$Jericho$$/compile-time-dependencies/* libs/ && \
-         sed -i 's/make -j4/make -j2/g' scripts/* && \
-         rm custom_rules.xml && chmod +x scripts/build-ffmpeg.sh && \
-         sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-         sed -i 's@\(reference.2=\).*@\1$$DragSort$$@' project.properties,\
-build=./scripts/build-ffmpeg.sh,\
-buildjni=yes
+Build:0.6.3,78
+    commit=v0.6.3
+    srclibs=ActionBarSherlock@4.2.0;DragSort@0.6.1;Streamscraper@f01d9ac64629;Jericho@3.2
+    prebuild=cp -f $$ActionBarSherlock$$/libs/android-support-v4.jar $$DragSort$$/libs/ && \
+        rm libs/streamscraper.jar && \
+        cp -r $$Streamscraper$$/src/net/moraleboost/ src/net/ && \
+        cp -r $$Jericho$$/src/java/net/htmlparser/ src/net/ && \
+        cp $$Jericho$$/compile-time-dependencies/* libs/ && \
+        sed -i 's/make -j4/make -j2/g' scripts/* && \
+        rm custom_rules.xml && \
+        chmod +x scripts/build-ffmpeg.sh && \
+        sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(reference.2=\).*@\1$$DragSort$$@' project.properties
+    build=./scripts/build-ffmpeg.sh
+    buildjni=yes
 
 # sed -i 's/x86 mips/mips/g' jni/Application.mk && \
 Auto Update Mode:None
-# Tags not working and e.g. v0.6.3 doesn't even check out
-Update Check Mode:None
-Current Version:0.6.3
-Current Version Code:78
+Update Check Mode:Tags
+Current Version:0.6.4
+Current Version Code:82
 
diff --git a/metadata/org.androhid.txt b/metadata/org.androhid.txt
index 6c278a7e4a..253dbf7b95 100644
--- a/metadata/org.androhid.txt
+++ b/metadata/org.androhid.txt
@@ -1,3 +1,4 @@
+Disabled:Still not buildable, no code updates for three years
 Category:System
 License:GPLv3
 Web Site:https://code.google.com/p/androhid/
diff --git a/metadata/org.androidsoft.app.permission.txt b/metadata/org.androidsoft.app.permission.txt
index ce0103efe6..ae01c44b3b 100644
--- a/metadata/org.androidsoft.app.permission.txt
+++ b/metadata/org.androidsoft.app.permission.txt
@@ -10,17 +10,23 @@ Description:
 Gives a rating to each app, based on how much influence they can have.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:https://androidsoft.googlecode.com/svn/trunk/permission/
 
-Build Version:1.4.1,12,64,prebuild=rm -rf releases,target=android-15
-Build Version:1.4.2,13,66,prebuild=rm -rf releases,target=android-15
+Build:1.4.1,12
+    commit=64
+    target=android-15
+    prebuild=rm -rf releases
+
+Build:1.4.2,13
+    commit=66
+    target=android-15
+    prebuild=rm -rf releases
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.4.2.1
-Current Version Code:14
+Update Check Mode:RepoManifest
+Current Version:1.4.2
+Current Version Code:13
 
 No Source Since:1.4.2.1
 
diff --git a/metadata/org.vudroid.txt b/metadata/org.vudroid.txt
index 76659fb008..f69f027539 100644
--- a/metadata/org.vudroid.txt
+++ b/metadata/org.vudroid.txt
@@ -10,16 +10,26 @@ Description:
 A document reader for DjVu and PDF files.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://vudroid.googlecode.com/svn/trunk/
 
-Build Version:1.2,3,36,buildjni=yes,target=android-8
-Build Version:1.3,4,51,buildjni=yes,target=android-8
-Build Version:1.4,5,56,buildjni=yes,target=android-8
+Build:1.2,3
+    commit=36
+    target=android-8
+    buildjni=yes
+
+Build:1.3,4
+    commit=51
+    target=android-8
+    buildjni=yes
+
+Build:1.4,5
+    commit=56
+    target=android-8
+    buildjni=yes
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.4
 Current Version Code:5