diff --git a/metadata/An.stop.txt b/metadata/An.stop.txt
index 7eeb26ed95..dbf33725b2 100644
--- a/metadata/An.stop.txt
+++ b/metadata/An.stop.txt
@@ -17,4 +17,6 @@ Build Version:1.4,9,34,subdir=trunk
 Build Version:1.5,10,100,subdir=branches/anstop-v1_5
 
 Update Check Mode:None
+Current Version:1.5
+Current Version Code:10
 
diff --git a/metadata/android.game.prboom.txt b/metadata/android.game.prboom.txt
index 91940b8b04..ab3062db7b 100644
--- a/metadata/android.game.prboom.txt
+++ b/metadata/android.game.prboom.txt
@@ -24,3 +24,5 @@ Repo Type:git-svn
 Repo:http://prboom4android.googlecode.com/svn/trunk/
 
 Build Version:1.3.1-beta,31,49,buildjni=yes
+
+Update Check Mode:Market
diff --git a/metadata/apps.droidnotify.txt b/metadata/apps.droidnotify.txt
index 07ab92fc47..5278cf9c67 100644
--- a/metadata/apps.droidnotify.txt
+++ b/metadata/apps.droidnotify.txt
@@ -25,6 +25,6 @@ Build Version:3.7,40,!No source code
 Build Version:3.12,45,!No source code
 
 Update Check Mode:Market
-Current Version:3.12
-Current Version Code:45
+Current Version:3.16
+Current Version Code:49
 
diff --git a/metadata/cgeo.geocaching.txt b/metadata/cgeo.geocaching.txt
index 3c4a012c6d..d24a92a693 100644
--- a/metadata/cgeo.geocaching.txt
+++ b/metadata/cgeo.geocaching.txt
@@ -14,8 +14,8 @@ Repo Type:git
 Repo:https://github.com/cgeo/c-geo-opensource.git
 
 Update Check Mode:Market
-Current Version:2012.06.28
-Current Version Code:20120628
+Current Version:2012.08.15
+Current Version Code:20120815
 
 #Needs version naming properly, we can't have all versions being called "developer  build"
 #Build Version:"developer  build",20120628,388a5a3b1c0885a65fb036feb2cbd3d4106e83f0,subdir=main
diff --git a/metadata/com.android.keepass.txt b/metadata/com.android.keepass.txt
index ddbe26dad9..06bb50832f 100644
--- a/metadata/com.android.keepass.txt
+++ b/metadata/com.android.keepass.txt
@@ -22,10 +22,10 @@ Build Version:1.9.5,82,v1.9.5
 Build Version:1.9.6,83,v1.9.6
 Build Version:1.9.7,84,v1.9.7,target=android-8
 Build Version:1.9.8,85,v1.9.8,target=android-8
+
 #Temporarily disabled - need MIPS version of NDK I think
 #Build Version:1.9.9,86,v1.9.9,target=android-8,buildjni=yes
-
 Update Check Mode:Market
-Current Version:1.9.9
-Current Version Code:86
+Current Version:1.9.14
+Current Version Code:91
 
diff --git a/metadata/com.axelby.podax.txt b/metadata/com.axelby.podax.txt
index 8f5c9bac1b..01cb9e7d64 100644
--- a/metadata/com.axelby.podax.txt
+++ b/metadata/com.axelby.podax.txt
@@ -31,6 +31,6 @@ Build Version:4.02,21,!e5da76325a5a build failure - submodules refer to deleted
 Build Version:4.03,22,!151b8d508b3 submodules still invalid - Clone of 'git://github.com/thasmin/ViewPagerIndicator.git' into submodule path 'ViewPagerIndicator' failed
 
 Update Check Mode:RepoManifest
-Current Version:4.03
-Current Version Code:22
+Current Version:4.5
+Current Version Code:28
 
diff --git a/metadata/com.boardgamegeek.txt b/metadata/com.boardgamegeek.txt
index 72e81aa94b..65a86cfcde 100644
--- a/metadata/com.boardgamegeek.txt
+++ b/metadata/com.boardgamegeek.txt
@@ -17,6 +17,6 @@ Build Version:3.3,20,r416,subdir=BoardGameGeek,target=android-8
 Build Version:3.4,21,r525,subdir=BoardGameGeek,target=android-8
 
 Update Check Mode:Market
-Current Version:3.5
-Current Version Code:22
+Current Version:3.6
+Current Version Code:23
 
diff --git a/metadata/com.bottleworks.dailymoney.txt b/metadata/com.bottleworks.dailymoney.txt
index 8f85dd110a..51c4cb6896 100644
--- a/metadata/com.bottleworks.dailymoney.txt
+++ b/metadata/com.bottleworks.dailymoney.txt
@@ -19,8 +19,8 @@ Repo Type:svn
 Repo:https://daily-money.googlecode.com/svn/trunk/
 
 Update Check Mode:Market
-Current Version:0.9.7-0702-freshly
-Current Version Code:2011070200
+Current Version:0.9.8-120802-freshly
+Current Version Code:2012080201
 
 # Does not build yet
 #Build Version:0.9.7-0702-freshly,2011070200,218,subdir=dailymoney-surface/,target=android-7,prebuild=\
diff --git a/metadata/com.bwx.bequick.txt b/metadata/com.bwx.bequick.txt
index 54263a7acf..5384d13f39 100644
--- a/metadata/com.bwx.bequick.txt
+++ b/metadata/com.bwx.bequick.txt
@@ -20,6 +20,6 @@ Build Version:1.9.9.3,201107260,220,target=android-8
 Build Version:1.9.9.7,201202290,!Source has disappeared
 
 Update Check Mode:Market
-Current Version:1.9.9.7
-Current Version Code:201202290
+Current Version:1.9.10
+Current Version Code:201207300
 
diff --git a/metadata/com.ciarang.tallyphant.txt b/metadata/com.ciarang.tallyphant.txt
index 9ad9437bb6..91755a7634 100644
--- a/metadata/com.ciarang.tallyphant.txt
+++ b/metadata/com.ciarang.tallyphant.txt
@@ -1,4 +1,3 @@
-
 Category:Office
 License:GPLv3
 Web Site:http://projects.ciarang.com/p/tallyphant/
@@ -25,4 +24,7 @@ Build Version:0.2,3,38c8d82a1b19c7313aea5cdaae9f93a95fcaac32
 Build Version:0.3,4,cbe9aa47adb5ac24244b4e80484fee3eb356cf8b
 Build Version:0.4,5,f207fbd7d2d7a682ba71c4fa7c446cc636401cba
 
-Update Check Mode:None
+Update Check Mode:RepoManifest
+Current Version:0.4
+Current Version Code:5
+
diff --git a/metadata/com.csipsimple.txt b/metadata/com.csipsimple.txt
index a5b1d10413..cdf24f0715 100644
--- a/metadata/com.csipsimple.txt
+++ b/metadata/com.csipsimple.txt
@@ -13,6 +13,6 @@ A SIP (VOIP) client.
 Update Check Mode:Market
 #Note : build needs a customised ndk, as described at:
 #  http://code.google.com/p/csipsimple/wiki/HowToBuild
-Current Version:0.03-01
-Current Version Code:1108
+Current Version:0.04-00
+Current Version Code:1788
 
diff --git a/metadata/com.dririan.RingyDingyDingy.txt b/metadata/com.dririan.RingyDingyDingy.txt
index 87ec13840e..7465b9c4e7 100644
--- a/metadata/com.dririan.RingyDingyDingy.txt
+++ b/metadata/com.dririan.RingyDingyDingy.txt
@@ -25,7 +25,6 @@ Build Version:0.7.1,701,v0.7.1
 Build Version:0.7.2,702,v0.7.2
 
 Update Check Mode:RepoManifest
-
-Current Version:0.7.2
-Current Version Code:702
+Current Version:0.7.3
+Current Version Code:000703
 
diff --git a/metadata/com.eleybourn.bookcatalogue.txt b/metadata/com.eleybourn.bookcatalogue.txt
index 7e9c223a3e..b310d1bd9d 100644
--- a/metadata/com.eleybourn.bookcatalogue.txt
+++ b/metadata/com.eleybourn.bookcatalogue.txt
@@ -30,6 +30,6 @@ Build Version:4.0.3,79,!No matching source
 Build Version:4.0.6,88,!0d673d0b1 but requires GoodReads API keys
 
 Update Check Mode:Market
-Current Version:4.0.6
-Current Version Code:88
+Current Version:4.0.7
+Current Version Code:90
 
diff --git a/metadata/com.fsck.k9.txt b/metadata/com.fsck.k9.txt
index aed7239e81..bbb9055bc2 100644
--- a/metadata/com.fsck.k9.txt
+++ b/metadata/com.fsck.k9.txt
@@ -16,6 +16,6 @@ Repo:https://github.com/k9mail/k-9.git
 #Note - k9 is currently developer's binary only
 #Build Version:3.906,14006,3.906,oldsdkloc=yes,patch=target9to10.patch,target=android-10
 Update Check Mode:Market
-Current Version:4.009
-Current Version Code:14027
+Current Version:4.011
+Current Version Code:14029
 
diff --git a/metadata/com.github.mobile.txt b/metadata/com.github.mobile.txt
index bc73c3a22c..903b87e949 100644
--- a/metadata/com.github.mobile.txt
+++ b/metadata/com.github.mobile.txt
@@ -28,6 +28,6 @@ Repo:https://github.com/github/android.git
 Build Version:1.1,600,1.1,maven=yes,bindir=app/target
 
 Update Check Mode:Market
-Current Version:1.1
-Current Version Code:600
+Current Version:1.2
+Current Version Code:700
 
diff --git a/metadata/com.ihunda.android.binauralbeat.txt b/metadata/com.ihunda.android.binauralbeat.txt
index a5487f8f0a..e33b43843c 100644
--- a/metadata/com.ihunda.android.binauralbeat.txt
+++ b/metadata/com.ihunda.android.binauralbeat.txt
@@ -23,10 +23,10 @@ Build Version:1.2,24,85160b47e80d1cac025d02756f642f3c8f667191
 Build Version:1.3,25,!No source in repo
 Build Version:1.6,29,!973a1ee943cfb251759f5e29137892f262a1d860 but source is incomplete - missing class and drawables
 Build Version:1.6.2,32,!No source in repo
+
 #Missing various things, won't build...
 #Build Version:1.7,34,e65c60a8ac
-
 Update Check Mode:Market
-Current Version:1.7
-Current Version Code:34
+Current Version:2.0.3
+Current Version Code:39
 
diff --git a/metadata/com.integralblue.callerid.txt b/metadata/com.integralblue.callerid.txt
index d459246289..e3e126cc6e 100644
--- a/metadata/com.integralblue.callerid.txt
+++ b/metadata/com.integralblue.callerid.txt
@@ -16,6 +16,6 @@ Repo:git://gitorious.org/callerid-for-android/mainline.git
 Update Check Mode:Market
 #Disabled pending figuring out how to stop it zipaligning....
 #Build Version:1.0,1,e6d5a9ac4bb24ae3866a0782f2b23d1f18eb2266,subdir=application,maven=yes,bindir=application/target,prebuild=wget http://osmdroid.googlecode.com/files/osmdroid-android-3.0.3.jar && mvn install:install-file -DgroupId=org.osmdroid -DartifactId=osmdroid -Dversion=3.0.3 -Dpackaging=jar -Dfile=osmdroid-android-3.0.3.jar
-Current Version:1.5
-Current Version Code:6
+Current Version:1.6
+Current Version Code:7
 
diff --git a/metadata/com.madgag.agit.txt b/metadata/com.madgag.agit.txt
index 3817bc9449..ec46402fe4 100644
--- a/metadata/com.madgag.agit.txt
+++ b/metadata/com.madgag.agit.txt
@@ -15,6 +15,6 @@ Repo:https://github.com/rtyley/agit.git
 #Nearly builds, but not quite
 #Build Version:1.28,120300515,441017d73a5bcd67729e95e779ff806da7fee204,maven=yes
 Update Check Mode:Market
-Current Version:1.31
-Current Version Code:120601307
+Current Version:1.34
+Current Version Code:120801417
 
diff --git a/metadata/com.owncloud.android.txt b/metadata/com.owncloud.android.txt
index cc450f54ea..37218cdba7 100644
--- a/metadata/com.owncloud.android.txt
+++ b/metadata/com.owncloud.android.txt
@@ -17,6 +17,6 @@ Repo:git://gitorious.org/owncloud/android-devel.git
 Build Version:1.3.1,103001,239be8fb4f,submodules=yes,prebuild=android update project -p actionbarsherlock/library
 
 Update Check Mode:RepoManifest
-Current Version:1.3.1
-Current Version Code:103001
+Current Version:1.3.6
+Current Version Code:103006
 
diff --git a/metadata/com.prey.txt b/metadata/com.prey.txt
index 7886498a91..e22cd1e117 100644
--- a/metadata/com.prey.txt
+++ b/metadata/com.prey.txt
@@ -27,6 +27,6 @@ Repo:https://github.com/prey/prey-android-client
 Build Version:0.5,34,8934cda82af81580a26cf4de233da15feaab1dfd,prebuild=echo "ask-for-password=true\nprey-minor-version=0\nprey-versionon=0.5\nprey-subdomain=control\nprey-domain=preyproject.com\n#c2dm\nc2dm-mail=\nc2dm-action=\nc2dm-message-sync=" > res/raw/config
 
 Update Check Mode:Market
-Current Version:0.5
-Current Version Code:33
+Current Version:0.5.5
+Current Version Code:35
 
diff --git a/metadata/com.proch.practicehub.txt b/metadata/com.proch.practicehub.txt
index 42c0dbb77e..b6ee89df32 100644
--- a/metadata/com.proch.practicehub.txt
+++ b/metadata/com.proch.practicehub.txt
@@ -16,6 +16,6 @@ Repo:https://code.google.com/p/music-practice-tools/
 Build Version:1.0,1,109c0bddf346
 
 Update Check Mode:Market
-Current Version:1.0
-Current Version Code:1
+Current Version:2.0
+Current Version Code:2
 
diff --git a/metadata/com.showmehills.txt b/metadata/com.showmehills.txt
index 03a6075958..f6b6cf2126 100644
--- a/metadata/com.showmehills.txt
+++ b/metadata/com.showmehills.txt
@@ -21,10 +21,10 @@ Build Version:0.16,16,v0.16,update=no,subdir=ShowMe/ShowMeHills,prebuild=\
 mkdir src && \
 echo "sdk.dir=$$SDK$$" >local.properties && \
 echo "sdk.dir=$$SDK$$" >../ShowMeX/local.properties
+
 #Note that 0.17 will either need acra.disabled patching to be true by default, or
 #the appropriate AntiFeature flag adding.
-
 Update Check Mode:Market
-Current Version:0.15
-Current Version Code:15
+Current Version:0.20
+Current Version Code:20
 
diff --git a/metadata/com.totsp.crossword.shortyz.txt b/metadata/com.totsp.crossword.shortyz.txt
index 219092b8d3..b1d3bae1ea 100644
--- a/metadata/com.totsp.crossword.shortyz.txt
+++ b/metadata/com.totsp.crossword.shortyz.txt
@@ -18,6 +18,6 @@ Build Version:3.1.0,30100,1ce970a00083,subdir=shortyz,target=android-11,prebuild
 Build Version:3.1.7,30107,!No source code apparently
 
 Update Check Mode:Market
-Current Version:3.1.7
-Current Version Code:30107
+Current Version:3.2.7
+Current Version Code:30207
 
diff --git a/metadata/com.ubuntuone.android.files.txt b/metadata/com.ubuntuone.android.files.txt
index 6485a85abc..e0c0e0d167 100644
--- a/metadata/com.ubuntuone.android.files.txt
+++ b/metadata/com.ubuntuone.android.files.txt
@@ -14,8 +14,8 @@ Repo Type:bzr
 Repo:lp:ubuntuone-android-files
 
 Update Check Mode:Market
-Current Version:1.2.3
-Current Version Code:315
+Current Version:1.2.4
+Current Version Code:404
 
 #Need more dependencies for this too, but pointless since at least one is proprietary.
 #The others will need to be checked carefully too.
diff --git a/metadata/com.zoffcc.applications.zanavi.txt b/metadata/com.zoffcc.applications.zanavi.txt
index 9d41f2c336..059d8e4239 100644
--- a/metadata/com.zoffcc.applications.zanavi.txt
+++ b/metadata/com.zoffcc.applications.zanavi.txt
@@ -3,7 +3,6 @@ License:GPLv2
 Web Site:http://zanavi.cc/index.php/Main_Page
 Source Code:http://viewsvn1.zanavi.cc/viewvc.cgi/zanavi_public1/navit/
 Issue Tracker:http://trac.zanavi.cc/
-Donate:
 
 Summary:Offline Navigation
 Description:
@@ -25,5 +24,9 @@ Features include:
 Repo Type:git-svn
 Repo:http://zanavi.cc/zanavi_public1/navit
 
+Update Check Mode:Market
+Current Version:2.0.0
+Current Version Code:200
+
 #......
 #Build Version:1.0.52
diff --git a/metadata/de.schildbach.wallet_test.txt b/metadata/de.schildbach.wallet_test.txt
index 88baca1a42..92fe0cfbb0 100644
--- a/metadata/de.schildbach.wallet_test.txt
+++ b/metadata/de.schildbach.wallet_test.txt
@@ -31,7 +31,6 @@ srclibs=BitcoinJWallet@8ced139bf179,\
 prebuild=\
 mvn3 install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3_r2 -Dpackaging=jar -Dfile=$$SDK$$/platforms/android-10/android.jar && \
 mvn3 install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar
-
 Build Version:2.16_test,87,49c3da045e57,subdir=wallet,maven=2,\
 bindir=wallet/target,\
 srclibs=BitcoinJWallet@a160dc24f38c,\
@@ -41,6 +40,6 @@ mvn3 install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3
 mvn3 install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar
 
 Update Check Mode:RepoManifest
-Current Version:2.16_test
-Current Version Code:87
+Current Version:2.21_test
+Current Version Code:92
 
diff --git a/metadata/de.ub0r.android.callmeter.txt b/metadata/de.ub0r.android.callmeter.txt
index a0c8f24300..c1c606ede9 100644
--- a/metadata/de.ub0r.android.callmeter.txt
+++ b/metadata/de.ub0r.android.callmeter.txt
@@ -12,6 +12,6 @@ CallMeter is an Android application summing up your call and text logs. Differen
 .
 
 Update Check Mode:Market
-Current Version:3.0
-Current Version Code:2836
+Current Version:3.5.1
+Current Version Code:7351000
 
diff --git a/metadata/dk.andsen.asqlitemanager.txt b/metadata/dk.andsen.asqlitemanager.txt
index 39f9c87560..d2d15a458f 100644
--- a/metadata/dk.andsen.asqlitemanager.txt
+++ b/metadata/dk.andsen.asqlitemanager.txt
@@ -20,6 +20,6 @@ Build Version:3.2,12,236,subdir=aSQLiteManager,target=android-10
 Build Version:3.3,13,241,subdir=aSQLiteManager,target=android-10
 
 Update Check Mode:Market
-Current Version:3.2
-Current Version Code:12
+Current Version:3.3.1
+Current Version Code:14
 
diff --git a/metadata/eu.vranckaert.worktime.txt b/metadata/eu.vranckaert.worktime.txt
index 2541e132e2..9da08da9df 100644
--- a/metadata/eu.vranckaert.worktime.txt
+++ b/metadata/eu.vranckaert.worktime.txt
@@ -20,6 +20,6 @@ Build Version:1.1.3.a - UNSTABLE,107,273,target=android-11,patch=style.patch
 Build Version:1.1.4,165,541,target=android-11,patch=style.patch
 
 Update Check Mode:Market
-Current Version:1.1.4
-Current Version Code:165
+Current Version:1.1.7
+Current Version Code:192
 
diff --git a/metadata/jp.co.kayo.android.localplayer.ds.ampache.txt b/metadata/jp.co.kayo.android.localplayer.ds.ampache.txt
index fc7d62be6f..5677729cdd 100644
--- a/metadata/jp.co.kayo.android.localplayer.ds.ampache.txt
+++ b/metadata/jp.co.kayo.android.localplayer.ds.ampache.txt
@@ -3,7 +3,6 @@ License:GPLv2
 Web Site:http://justplayer-dev.blogspot.jp/
 Source Code:https://bitbucket.org/yokmama/just-player-providers/src
 Issue Tracker:https://plus.google.com/101509207997544022048
-Donate:
 
 Summary:Ampache plugin for Just-Player
 Description:
@@ -13,5 +12,9 @@ This app allows you to add remote streaming functionality to Just-Player using A
 Repo Type:git
 Repo:https://bitbucket.org/yokmama/just-player-providers.git
 
+Update Check Mode:Market
+Current Version:1.19
+Current Version Code:410044
+
 #Build problems
 #Build Version:1.19,410044,1370e4cfe884,subdir=AmpacheProvider
diff --git a/metadata/jp.sblo.pandora.jota.txt b/metadata/jp.sblo.pandora.jota.txt
index c61da79fbf..a31feb0772 100644
--- a/metadata/jp.sblo.pandora.jota.txt
+++ b/metadata/jp.sblo.pandora.jota.txt
@@ -19,6 +19,6 @@ Build Version:0.2.07,57,86,buildjni=yes,target=android-11
 Build Version:0.2.13,63,113,buildjni=yes,target=android-11
 
 Update Check Mode:Market
-Current Version:0.2.19
-Current Version Code:69
+Current Version:0.2.26
+Current Version Code:76
 
diff --git a/metadata/kaljurand_at_gmail_dot_com.diktofon.txt b/metadata/kaljurand_at_gmail_dot_com.diktofon.txt
index c36d1b89f7..d03cdbb13c 100644
--- a/metadata/kaljurand_at_gmail_dot_com.diktofon.txt
+++ b/metadata/kaljurand_at_gmail_dot_com.diktofon.txt
@@ -3,7 +3,6 @@ License:Apache 2.0
 Web Site:http://code.google.com/p/diktofon/
 Source Code:https://github.com/Kaljurand/Diktofon/
 Issue Tracker:http://code.google.com/p/diktofon/issues/list
-Donate:
 
 Summary:Dictaphone with text-to-speech for Estonian
 Description:
@@ -19,5 +18,9 @@ The Diktofon app provides also language independent features like tagging, high
 Repo Type:git
 Repo:https://github.com/Kaljurand/Diktofon.git
 
+Update Check Mode:Market
+Current Version:0.9.76
+Current Version Code:976
+
 #Missing dependencies (and possibly proprietary)
 #Build Version:0.9.76,976,8036d6c7,subdir=app
diff --git a/metadata/me.guillaumin.android.osmtracker.txt b/metadata/me.guillaumin.android.osmtracker.txt
index 8e045985d9..24db62156c 100644
--- a/metadata/me.guillaumin.android.osmtracker.txt
+++ b/metadata/me.guillaumin.android.osmtracker.txt
@@ -1,10 +1,10 @@
-Name:OSMTracker
 Category:Navigation
 License:GPLv3
 Web Site:https://code.google.com/p/osmtracker-android/
 Source Code:https://github.com/nguillaumin/osmtracker-android
 Issue Tracker:https://code.google.com/p/osmtracker-android/issues/list
 
+Name:OSMTracker
 Summary:GPS Track Recorder
 Description:
 OSMTracker allows you to track your journey and mark significant way points.
@@ -21,6 +21,6 @@ Build Version:0.5.6,21,0.5.6,target=android-8
 Build Version:0.5.7,22,eac27c8a37066988f784cbc2ad7e7a2ab0326839,target=android-8
 
 Update Check Mode:Market
-Current Version:0.5.7
-Current Version Code:22
+Current Version:0.6.2
+Current Version Code:26
 
diff --git a/metadata/me.shkschneider.dropbearserver.txt b/metadata/me.shkschneider.dropbearserver.txt
index 5e93f9cbf4..6a0e360dee 100644
--- a/metadata/me.shkschneider.dropbearserver.txt
+++ b/metadata/me.shkschneider.dropbearserver.txt
@@ -36,6 +36,6 @@ Repo:https://github.com/shkschneider/android_DropBearServer.git
 Build Version:1.7.0,170,b943a751dc
 
 Update Check Mode:Market
-Current Version:1.8.6
-Current Version Code:186
+Current Version:1.9.4
+Current Version Code:194
 
diff --git a/metadata/name.boyle.chris.sgtpuzzles.txt b/metadata/name.boyle.chris.sgtpuzzles.txt
index a863979580..395cee4bd9 100644
--- a/metadata/name.boyle.chris.sgtpuzzles.txt
+++ b/metadata/name.boyle.chris.sgtpuzzles.txt
@@ -3,7 +3,6 @@ License:MIT
 Web Site:http://chris.boyle.name/projects/android-puzzles
 Source Code:https://github.com/chrisboyle/sgtpuzzles
 Issue Tracker:https://github.com/chrisboyle/sgtpuzzles/issues
-Donate:
 
 Summary:33 single-player logic games
 Description:
@@ -14,5 +13,9 @@ logic games.
 Repo Type:git
 Repo:git://github.com/chrisboyle/sgtpuzzles.git
 
+Update Check Mode:Market
+Current Version:9561.1
+Current Version Code:72
+
 #This doesn't build
 #Build Version:9411.2,70,bb35b1265f,buildjni=yes
diff --git a/metadata/net.cactii.mathdoku.txt b/metadata/net.cactii.mathdoku.txt
index 9b5f6fc20d..8ab37d65c8 100644
--- a/metadata/net.cactii.mathdoku.txt
+++ b/metadata/net.cactii.mathdoku.txt
@@ -15,6 +15,6 @@ Repo:http://mathdoku.googlecode.com/svn/trunk/
 Build Version:1.8,70,70
 
 Update Check Mode:Market
-Current Version:1.8
-Current Version Code:70
+Current Version:1.95c
+Current Version Code:76
 
diff --git a/metadata/net.mafro.android.wakeonlan.txt b/metadata/net.mafro.android.wakeonlan.txt
index eef813db07..7fe0918e08 100644
--- a/metadata/net.mafro.android.wakeonlan.txt
+++ b/metadata/net.mafro.android.wakeonlan.txt
@@ -15,6 +15,6 @@ Repo:https://github.com/mafrosis/Wake-On-Lan.git
 Build Version:1.4.2,12,468312845057e78a70f7b6260f2b116042571c42
 
 Update Check Mode:Market
-Current Version:1.4.2
-Current Version Code:12
+Current Version:1.5
+Current Version Code:13
 
diff --git a/metadata/net.osmand.plus.txt b/metadata/net.osmand.plus.txt
index 78692253dd..8b0ebbeb81 100644
--- a/metadata/net.osmand.plus.txt
+++ b/metadata/net.osmand.plus.txt
@@ -24,6 +24,6 @@ Build Version:0.6.9,42,v0.6.9,subdir=OsmAnd,encoding=utf-8,prebuild=mkdir raw
 Build Version:0.6.9',43,!No corresponding source for whatever this is
 
 Update Check Mode:Market
-Current Version:0.7.3
-Current Version Code:55
+Current Version:0.8.1
+Current Version Code:65
 
diff --git a/metadata/net.osmand.txt b/metadata/net.osmand.txt
index a7fd8f4c36..f537e83494 100644
--- a/metadata/net.osmand.txt
+++ b/metadata/net.osmand.txt
@@ -18,6 +18,6 @@ Build Version:0.5.2,25,efc0e83a,subdir=OsmAnd,encoding=utf-8,prebuild=mkdir asse
 Build Version:0.5.3,26,8e9d76ea685ea75d6c08,subdir=OsmAnd,encoding=utf-8,prebuild=mkdir assets && mkdir raw
 
 Update Check Mode:Market
-Current Version:0.7.3
-Current Version Code:56
+Current Version:0.8.1
+Current Version Code:65
 
diff --git a/metadata/net.sourceforge.servestream.txt b/metadata/net.sourceforge.servestream.txt
index b279946d70..55901f6849 100644
--- a/metadata/net.sourceforge.servestream.txt
+++ b/metadata/net.sourceforge.servestream.txt
@@ -26,6 +26,6 @@ Build Version:0.4.8,58,1031,prebuild=mv lib/ libs/
 Build Version:0.4.9,59,1049,buildjni=no
 
 Update Check Mode:Market
-Current Version:0.4.9
-Current Version Code:59
+Current Version:0.4.11
+Current Version Code:61
 
diff --git a/metadata/org.aprsdroid.app.txt b/metadata/org.aprsdroid.app.txt
index 373b0dd548..cb07c66214 100644
--- a/metadata/org.aprsdroid.app.txt
+++ b/metadata/org.aprsdroid.app.txt
@@ -3,7 +3,6 @@ License:GPLv2
 Web Site:http://aprsdroid.org
 Source Code:https://github.com/ge0rg/aprsdroid
 Issue Tracker:https://github.com/ge0rg/aprsdroid/issues
-Donate:
 
 Summary:App for Amateur Radio Operators
 Description:
@@ -13,5 +12,9 @@ Report your position to the APRS-IS network and view nearby stations on a map. A
 Repo Type:git
 Repo:https://github.com/ge0rg/aprsdroid.git
 
+Update Check Mode:Market
+Current Version:1.2.0
+Current Version Code:10
+
 #Missing AudioBufferProcessor.java...
 #Build Version:1.2.0,10,6060f53846
diff --git a/metadata/org.eehouse.android.xw4.txt b/metadata/org.eehouse.android.xw4.txt
index ae0b8c6906..d89f4b8330 100644
--- a/metadata/org.eehouse.android.xw4.txt
+++ b/metadata/org.eehouse.android.xw4.txt
@@ -23,5 +23,5 @@ Build Version:4.4 beta 39,31,android_beta_39,subdir=xwords4/android/XWords4,buil
 
 Update Check Mode:Market
 Current Version:4.4
-Current Version Code:38
+Current Version Code:42
 
diff --git a/metadata/org.liberty.android.fantastischmemo.txt b/metadata/org.liberty.android.fantastischmemo.txt
index 5cd550d400..158f8b90b7 100644
--- a/metadata/org.liberty.android.fantastischmemo.txt
+++ b/metadata/org.liberty.android.fantastischmemo.txt
@@ -15,11 +15,10 @@ Repo:https://github.com/helloworld1/AnyMemo.git
 
 Build Version:8.3.0,135,a591497118fe2cae101027add50d835c7fe6ed27,target=android-13,prebuild=rm -rf jni/
 Build Version:8.3.1,136,!No source in repo
+
 #Doesn't build, may need some adjustments...
 #Build Version:9.0.10,160,2da472cae9a732a8ad1144a93ab7e83201b8f0a6,target=android-13,prebuild=rm -rf jni/
-
-
 Update Check Mode:Market
-Current Version:9.0.10
-Current Version Code:160
+Current Version:9.1
+Current Version Code:166
 
diff --git a/metadata/org.mozilla.firefox_beta.txt b/metadata/org.mozilla.firefox_beta.txt
index 5c2404784b..46db497e98 100644
--- a/metadata/org.mozilla.firefox_beta.txt
+++ b/metadata/org.mozilla.firefox_beta.txt
@@ -14,5 +14,5 @@ Beta version of Firefox Mobile web browser.
 #They come from here: http://ftp.mozilla.org/pub/mozilla.org/mobile/releases/latest/android/multi/
 Update Check Mode:Market
 Current Version:15.0
-Current Version Code:2012072419
+Current Version Code:2012081423
 
diff --git a/metadata/org.navitproject.navit.txt b/metadata/org.navitproject.navit.txt
index 584c9dbbad..0d741a9187 100644
--- a/metadata/org.navitproject.navit.txt
+++ b/metadata/org.navitproject.navit.txt
@@ -16,8 +16,7 @@ Repo:https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit
 
 ## apks at http://download.navit-project.org/navit/android/svn/ and http://download.navit-project.org/navit/android_armv4t/svn/
 ## don't know where to find version and version code
-
 Update Check Mode:Market
 Current Version:navit
-Current Version Code:4785
+Current Version Code:5197
 
diff --git a/metadata/org.pyload.android.client.txt b/metadata/org.pyload.android.client.txt
index b299cb5167..2de5c45e45 100644
--- a/metadata/org.pyload.android.client.txt
+++ b/metadata/org.pyload.android.client.txt
@@ -29,3 +29,7 @@ Repo:https://bitbucket.org/ranan/pyload-android
 
 Build Version:0.2.5,12,74ce7f5c81b0,prebuild=mv lib/* libs/ && rm -r lib/
 
+Update Check Mode:Market
+Current Version:0.2.5
+Current Version Code:12
+
diff --git a/metadata/org.thoughtcrime.securesms.txt b/metadata/org.thoughtcrime.securesms.txt
index 82e899eb39..04076b41e6 100644
--- a/metadata/org.thoughtcrime.securesms.txt
+++ b/metadata/org.thoughtcrime.securesms.txt
@@ -19,6 +19,6 @@ Repo:https://github.com/WhisperSystems/TextSecure.git
 Build Version:0.5.7,21,6a30867fd481474e8634b508d524863bc8a6b565,target=android-10
 
 Update Check Mode:Market
-Current Version:0.5.7
-Current Version Code:21
+Current Version:0.6.2
+Current Version Code:24
 
diff --git a/metadata/org.wahtod.wififixer.txt b/metadata/org.wahtod.wififixer.txt
index 656a71582f..6e469e40af 100644
--- a/metadata/org.wahtod.wififixer.txt
+++ b/metadata/org.wahtod.wififixer.txt
@@ -24,6 +24,6 @@ Build Version:0.9.0.1,915,!commit 7155ca938dc1 but can't compile for some reason
 Build Version:0.9.0.2,922,b354e4538bf242f10125af49050e36126b668972,subdir=wififixer,target=android-15
 
 Update Check Mode:Market
-Current Version:0.9.0.3
-Current Version Code:931
+Current Version:0.9.5.1
+Current Version Code:955
 
diff --git a/metadata/org.xcsoar.txt b/metadata/org.xcsoar.txt
index f781c4fff5..e3d8c33cfd 100644
--- a/metadata/org.xcsoar.txt
+++ b/metadata/org.xcsoar.txt
@@ -15,8 +15,8 @@ Repo Type:git
 Repo:http://git.xcsoar.org/cgit/master/xcsoar.git/
 
 Update Check Mode:Market
-Current Version:6.3.8
-Current Version Code:65
+Current Version:6.4
+Current Version Code:69
 
 #Far too difficult to build - binary in repo
 #Build Version:6.2.4,51,95a3ad045eb05cb69b11b274f27c7eae387b9c40
diff --git a/metadata/org.yaaic.txt b/metadata/org.yaaic.txt
index d24f0bad5d..0bf97d7c8f 100644
--- a/metadata/org.yaaic.txt
+++ b/metadata/org.yaaic.txt
@@ -18,10 +18,10 @@ Repo:https://github.com/pocmo/Yaaic.git
 Build Version:0.7,9,v0.7,subdir=application,bindir=builds/ant
 Build Version:0.8,10,v0.8,subdir=application,bindir=builds/ant
 Build Version:0.9,11,v0.9,subdir=application,bindir=builds/ant
+
 #Complains that the embedded ActionBarSherlock has an invalid build.xml
 #Build Version:1.0,12,db6ed0a1224,subdir=application,bindir=builds/ant
-
 Update Check Mode:Market
-Current Version:0.9
-Current Version Code:11
+Current Version:1.0
+Current Version Code:12
 
diff --git a/metadata/ru.orangesoftware.financisto.txt b/metadata/ru.orangesoftware.financisto.txt
index 57464af3ec..65009dc678 100644
--- a/metadata/ru.orangesoftware.financisto.txt
+++ b/metadata/ru.orangesoftware.financisto.txt
@@ -21,8 +21,8 @@ Repo Type:bzr
 Repo:lp:financisto
 
 Update Check Mode:Market
-Current Version:1.5.9u1
-Current Version Code:76
+Current Version:1.6.0
+Current Version Code:77
 
 # Build fails, wrong path to GreenDroid library
 #Build Version:1.5.4,57,303,target=android-4
diff --git a/metadata/sk.baka.aedict.txt b/metadata/sk.baka.aedict.txt
index 3e748c7246..90c805d568 100644
--- a/metadata/sk.baka.aedict.txt
+++ b/metadata/sk.baka.aedict.txt
@@ -31,5 +31,9 @@ Allows automatic download of a German/French EDict, the names dictionary and the
 Repo Type:hg
 Repo:https://code.google.com/p/aedict/
 
+Update Check Mode:Market
+Current Version:2.9
+Current Version Code:290
+
 #Doesn't build, needs work...
 #Build Version:2.10,2100,df770685
diff --git a/metadata/stericson.busybox.donate.txt b/metadata/stericson.busybox.donate.txt
index dfdacd3f41..2d9602b247 100644
--- a/metadata/stericson.busybox.donate.txt
+++ b/metadata/stericson.busybox.donate.txt
@@ -31,6 +31,6 @@ Build Version:7.6.1,112,!No source available
 Build Version:7.8.3,117,!No source available
 
 Update Check Mode:Market
-Current Version:9.2
-Current Version Code:134
+Current Version:9.4
+Current Version Code:136
 
diff --git a/metadata/uk.ac.cam.cl.dtg.android.barcodebox.txt b/metadata/uk.ac.cam.cl.dtg.android.barcodebox.txt
index f122f16f84..dcccac301a 100644
--- a/metadata/uk.ac.cam.cl.dtg.android.barcodebox.txt
+++ b/metadata/uk.ac.cam.cl.dtg.android.barcodebox.txt
@@ -15,6 +15,6 @@ Repo:https://github.com/ucam-cl-dtg/barcodebox.git
 Build Version:1.1.1,3,a78f80f87298bb1cba0d80bc699ba2841be66e2a
 
 Update Check Mode:RepoManifest
-Current Version:1.1.1
-Current Version Code:3
+Current Version:1.1.2
+Current Version Code:4