diff --git a/metadata/android.androidVNC.txt b/metadata/android.androidVNC.txt
index 77a54b9c95..1e52d0b31f 100644
--- a/metadata/android.androidVNC.txt
+++ b/metadata/android.androidVNC.txt
@@ -16,8 +16,7 @@ Repo:http://android-vnc-viewer.googlecode.com/svn/branches/antlersoft
 Build Version:0.5.0,13,197,subdir=androidVNC
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:0.5.0
 Current Version Code:13
 
diff --git a/metadata/campyre.android.txt b/metadata/campyre.android.txt
index 3ca311ecd5..bdcd490a49 100644
--- a/metadata/campyre.android.txt
+++ b/metadata/campyre.android.txt
@@ -15,11 +15,10 @@ Description:
 Repo Type:git
 Repo:https://github.com/konklone/campyre.git
 
-Build Version:1.0.1,7,91b1224cc4bee18047,prebuild=rm -rf ./assets/releases
+Build Version:1.0.1,7,91b1224cc4bee18047
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.0.1
 Current Version Code:7
 
diff --git a/metadata/com.amphoras.tpthelper.txt b/metadata/com.amphoras.tpthelper.txt
index 6add04d673..a5e8a1c9ad 100644
--- a/metadata/com.amphoras.tpthelper.txt
+++ b/metadata/com.amphoras.tpthelper.txt
@@ -18,8 +18,7 @@ Repo:https://github.com/Amphoras/TPT-Helper.git
 Build Version:2.0.3,24,e2c80263eef99fd6ab4aa656bfae47a22389493f,subdir=TPT Helper,target=android-10
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:2.0.3
 Current Version Code:24
 
diff --git a/metadata/com.chessclock.android.txt b/metadata/com.chessclock.android.txt
index f7795ba7e8..3b6200a2db 100644
--- a/metadata/com.chessclock.android.txt
+++ b/metadata/com.chessclock.android.txt
@@ -17,8 +17,7 @@ Repo:https://code.google.com/p/simplechessclock/
 Build Version:1.2.0,8,379155447bff,subdir=simplechessclock,target=android-8
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.2.0
 Current Version Code:8
 
diff --git a/metadata/com.googamaphone.typeandspeak.txt b/metadata/com.googamaphone.typeandspeak.txt
index 51ddd4d06b..030acf510e 100644
--- a/metadata/com.googamaphone.typeandspeak.txt
+++ b/metadata/com.googamaphone.typeandspeak.txt
@@ -20,8 +20,7 @@ Repo:https://code.google.com/p/typeandspeak/
 Build Version:1.4.8,36,44fe67acc70a,prebuild=mkdir -p typeandspeak-libs/src
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.4.8
 Current Version Code:36
 
diff --git a/metadata/com.jakebasile.android.hearingsaver.txt b/metadata/com.jakebasile.android.hearingsaver.txt
index a3c325c2c3..f49abd30d3 100644
--- a/metadata/com.jakebasile.android.hearingsaver.txt
+++ b/metadata/com.jakebasile.android.hearingsaver.txt
@@ -23,8 +23,7 @@ Build Version:3.0,12,48f670
 Build Version:3.1,13,release-3.1
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:3.1
 Current Version Code:13
 
diff --git a/metadata/com.leafdigital.kanji.android.txt b/metadata/com.leafdigital.kanji.android.txt
index 12c6f4ffdb..3365f1ef43 100644
--- a/metadata/com.leafdigital.kanji.android.txt
+++ b/metadata/com.leafdigital.kanji.android.txt
@@ -39,8 +39,7 @@ Repo:https://github.com/quen/kanjirecog.git
 Build Version:1.0,2,63fca25a224,prebuild=rm -rf tests design
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest/android
 Current Version:1.0
 Current Version Code:2
 
diff --git a/metadata/com.mp3tunes.android.player.txt b/metadata/com.mp3tunes.android.player.txt
index 704a0d411a..9104f5cec1 100644
--- a/metadata/com.mp3tunes.android.player.txt
+++ b/metadata/com.mp3tunes.android.player.txt
@@ -22,11 +22,9 @@ Repo Type:hg
 Repo:https://mp3tunes.googlecode.com/hg/
 
 Build Version:3.7,89,ba4550305733,target=android-4,fixapos=yes
-Build Version:5.1,92,!No source in repo
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:5.1
-Current Version Code:92
+Update Check Mode:RepoManifest
+Current Version:3.7
+Current Version Code:89
 
diff --git a/metadata/com.ubuntuone.android.files.txt b/metadata/com.ubuntuone.android.files.txt
index 269c65fec9..59567d27f4 100644
--- a/metadata/com.ubuntuone.android.files.txt
+++ b/metadata/com.ubuntuone.android.files.txt
@@ -30,8 +30,7 @@ sed -i 's@android@$$SDK$$/tools/android@g' tools.sh && \
 sed -i '87\,108d' build.xml && ant setup
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.2.7
 Current Version Code:460
 
diff --git a/metadata/de.joergjahnke.c64.android.txt b/metadata/de.joergjahnke.c64.android.txt
index acf2362bae..1d084ef5b7 100644
--- a/metadata/de.joergjahnke.c64.android.txt
+++ b/metadata/de.joergjahnke.c64.android.txt
@@ -12,7 +12,6 @@ A Commodore 64 (C64) emulator.
 .
 
 Auto Update Mode:None
-#Update Check Mode:Market
 Update Check Mode:None
 Current Version:1.6.16
 Current Version Code:10616
diff --git a/metadata/de.stefan_oltmann.kaesekaestchen.txt b/metadata/de.stefan_oltmann.kaesekaestchen.txt
index 7bf9be75aa..ab5650aa39 100644
--- a/metadata/de.stefan_oltmann.kaesekaestchen.txt
+++ b/metadata/de.stefan_oltmann.kaesekaestchen.txt
@@ -16,13 +16,12 @@ playing against the computer. The computer is red; you are blue.
 .
 
 Repo Type:git-svn
-Repo:http://kaesekaestchen.googlecode.com/svn/trunk/
+Repo:http://kaesekaestchen.googlecode.com/svn/trunk/Kaesekaestchen
 
-Build Version:0.5,7,9,subdir=Kaesekaestchen
+Build Version:0.5,7,9
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:0.5
 Current Version Code:7
 
diff --git a/metadata/ru.orangesoftware.financisto.txt b/metadata/ru.orangesoftware.financisto.txt
index 0e68d90170..597201a08c 100644
--- a/metadata/ru.orangesoftware.financisto.txt
+++ b/metadata/ru.orangesoftware.financisto.txt
@@ -24,13 +24,10 @@ Personal finance manager
 Repo Type:bzr
 Repo:lp:financisto
 
-Auto Update Mode:None
-# Build fails, wrong path to GreenDroid library
-#Build Version:1.5.4,57,303,target=android-4
 #Unidentified GDocsAPI.jar ; uses Google APIs to build
 #Build Version:1.6.1,79,426
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.6.4
-Current Version Code:82
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.6.5u1
+Current Version Code:84
 
diff --git a/metadata/vnd.blueararat.kaleidoscope6.txt b/metadata/vnd.blueararat.kaleidoscope6.txt
index 4044095910..831032b01c 100644
--- a/metadata/vnd.blueararat.kaleidoscope6.txt
+++ b/metadata/vnd.blueararat.kaleidoscope6.txt
@@ -19,8 +19,7 @@ Repo:https://github.com/prrt714/Kaleidoscope.git
 Build Version:1.1.2,18,d851b
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:AndroidManifest
 Current Version:1.1.2
 Current Version Code:18