diff --git a/metadata/android.tether.txt b/metadata/android.tether.txt
index daf37bd2f8..39856bdcf3 100644
--- a/metadata/android.tether.txt
+++ b/metadata/android.tether.txt
@@ -13,7 +13,7 @@ This application requires a "rooted"-device and(probably) a custom-kernel which
 .
 
 Requires Root:Yes
-Repo Type:git-svn
+Repo Type:svn
 Repo:http://android-wifi-tether.googlecode.com/svn/trunk/
 
-Build Version:2.0.7,26,r523
+Build Version:2.0.7,26,523,buildjni=yes
diff --git a/metadata/cgeo.geocaching.txt b/metadata/cgeo.geocaching.txt
index 3ac89c58ed..1fcbdeccce 100644
--- a/metadata/cgeo.geocaching.txt
+++ b/metadata/cgeo.geocaching.txt
@@ -13,4 +13,5 @@ Geocaching is a sport where people hide things and you go and find them.
 Repo Type:git
 Repo:https://github.com/cgeo/c-geo-opensource.git
 
-Build Version:"developer  build",20120628,388a5a3b1c0885a65fb036feb2cbd3d4106e83f0,subdir=main
+#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.alfray.asqare.txt b/metadata/com.alfray.asqare.txt
index 86abc2d61f..b7937ff571 100644
--- a/metadata/com.alfray.asqare.txt
+++ b/metadata/com.alfray.asqare.txt
@@ -17,4 +17,4 @@ The game offers two variations on the gameplay and manages a list of current gam
 Repo Type:git
 Repo:https://code.google.com/p/asqare/
 
-Build Version:1.3,103,61828d08
+Build Version:1.3,103,61828d08,subdir=asqare
diff --git a/metadata/com.brocktice.JustSit.txt b/metadata/com.brocktice.JustSit.txt
index 2439f8ac2a..bb4256984c 100644
--- a/metadata/com.brocktice.JustSit.txt
+++ b/metadata/com.brocktice.JustSit.txt
@@ -1,7 +1,7 @@
 Category:Science
 License:GPLv3/CCv3.0by
 Web Site:https://code.google.com/p/justsit/
-Source Code:https://code.google.com/p/justsit/source/list
+Source Code:https://code.google.com/p/justsit/source/checkout
 Issue Tracker:https://code.google.com/p/justsit/issues/list
 Donate:
 
@@ -17,4 +17,4 @@ The name is inspired by the saying,
 Repo Type:git-svn
 Repo:http://justsit.googlecode.com/svn/trunk/
 
-Build Version:0.3.3,17,r24
+Build Version:0.3.3,17,24,subdir=JustSit
diff --git a/metadata/com.drodin.tuxrider.txt b/metadata/com.drodin.tuxrider.txt
index da452f142e..259e340585 100644
--- a/metadata/com.drodin.tuxrider.txt
+++ b/metadata/com.drodin.tuxrider.txt
@@ -1,4 +1,5 @@
-#possible antifeature ads
+Disabled:Proprietary dependencies
+AntiFeatures:Ads
 Category:Games
 License:GPLv2+
 Web Site:http://tuxrider.drodin.com/
@@ -15,7 +16,7 @@ Repo:git://github.com/drodin/TuxRider.git
 
 Update Check Mode:Market
 #Build Version:1.0.4 beta,6,67bce39cda321c225bc5
-Build Version:1.0.9 beta,11,36220e5
+Build Version:1.0.9 beta,11,36220e5,buildjni=yes
 
 Current Version:1.0.9
 Current Version Code:11
diff --git a/metadata/com.gcstar.scanner.txt b/metadata/com.gcstar.scanner.txt
index b0b9266776..3c16851548 100644
--- a/metadata/com.gcstar.scanner.txt
+++ b/metadata/com.gcstar.scanner.txt
@@ -10,7 +10,8 @@ Description:
 GCstar is a cross-platform application for managing your collections. Detailed information on each item can be automatically retrieved from the internet and you can store additional data, such as the location or who you've lent it to. You may also search and filter your collection by many criteria. 
 .
 
-Repo Type:git-svn
-Repo:http://svn.gna.org/viewcvs/gcstar/scanner
+#Source not retrievable from there
+#Repo Type:git-svn
+#Repo:http://svn.gna.org/viewcvs/gcstar/scanner
 
-Build Version:1.0,1,r2124
+#Build Version:1.0,1,2124
diff --git a/metadata/com.gcstar.viewer.txt b/metadata/com.gcstar.viewer.txt
index f525f55a9c..b94861b31a 100644
--- a/metadata/com.gcstar.viewer.txt
+++ b/metadata/com.gcstar.viewer.txt
@@ -10,8 +10,7 @@ Description:
 GCstar is a cross-platform application for managing your collections. Detailed information on each item can be automatically retrieved from the internet and you can store additional data, such as the location or who you've lent it to. You may also search and filter your collection by many criteria. 
 .
 
-Repo Type:git-svn
-Repo:http://svn.gna.org/viewcvs/gcstar/viewer
+#Repo Type:git-svn
+#Repo:http://svn.gna.org/viewcvs/gcstar/viewer
 
-Build Version:name,code,commit/tag/revision
-Build Version:2.8,10,r2149
+#Build Version:2.8,10,2149
diff --git a/metadata/com.glTron.txt b/metadata/com.glTron.txt
index 1ad69293b5..eebfbe52e4 100644
--- a/metadata/com.glTron.txt
+++ b/metadata/com.glTron.txt
@@ -13,7 +13,7 @@ Relive the film as you try and cut off your opponents before they cut you off!!
 Repo Type:git
 Repo:https://github.com/Chluverman/android-gltron.git
 
-Build Version:1.1.1,3,acea0d6d803b4e24241455090c7b454252a5e0d0,subdir=GlTron
+Build Version:1.1.2,4,814e6eb9fc14e9620c13bc5c8480b442d2f5350e,subdir=GlTron
 
 Update Check Mode:Market
 
diff --git a/metadata/com.ihunda.android.binauralbeat.txt b/metadata/com.ihunda.android.binauralbeat.txt
index 9c00480fff..a5487f8f0a 100644
--- a/metadata/com.ihunda.android.binauralbeat.txt
+++ b/metadata/com.ihunda.android.binauralbeat.txt
@@ -23,7 +23,8 @@ 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
-Build Version:1.7,34,e65c60a8ac
+#Missing various things, won't build...
+#Build Version:1.7,34,e65c60a8ac
 
 Update Check Mode:Market
 Current Version:1.7
diff --git a/metadata/com.morphoss.acal.txt b/metadata/com.morphoss.acal.txt
index abe4a268bd..f901860a05 100644
--- a/metadata/com.morphoss.acal.txt
+++ b/metadata/com.morphoss.acal.txt
@@ -34,6 +34,7 @@ Build Version:1.36,38,r1.36,target=android-8
 Build Version:1.53,53,9933536cb926ca457d5fa4e6cf827b063fbab709,target=android-8
 Build Version:1.54,54,r1.54,target=android-8
 Build Version:1.55,55,r1.55,target=android-8
+Build Version:1.56,56,r1.56,target=android-8
 
 Update Check Mode:RepoManifest
 Current Version:1.54
diff --git a/metadata/com.roozen.SoundManager.txt b/metadata/com.roozen.SoundManager.txt
index 2f8daec725..1a411328c9 100644
--- a/metadata/com.roozen.SoundManager.txt
+++ b/metadata/com.roozen.SoundManager.txt
@@ -16,7 +16,8 @@ Repo Type:svn
 Repo:http://app-soundmanager.googlecode.com/svn/tags/
 
 Build Version:2.0.0,18,127,subdir=SoundManager-2.0.0,target=android-8,fixapos=yes
-Build Version:2.1.0,19,156 # release candidate since last april
+#Missing resources....
+#Build Version:2.1.0,19,156,subdir=SoundManager-2.0.0,target=android-8,fixapos=yes # release candidate since last april
 
 Update Check Mode:Market
 Current Version:2.0.0
diff --git a/metadata/com.scottmain.android.searchlight.txt b/metadata/com.scottmain.android.searchlight.txt
index 914b9a00a3..c09c9ac5e0 100644
--- a/metadata/com.scottmain.android.searchlight.txt
+++ b/metadata/com.scottmain.android.searchlight.txt
@@ -13,7 +13,7 @@ Repo Type:git-svn
 Repo:http://search-light.googlecode.com/svn/trunk/
 
 Build Version:1.0,1,2
-Build Version:1.3,4,r4
+Build Version:1.3,4,4,target=android-15
 
 Update Check Mode:Market
 Current Version:1.3
diff --git a/metadata/com.serone.desktoplabel.txt b/metadata/com.serone.desktoplabel.txt
index 86b7d3ba8b..77f21f378e 100644
--- a/metadata/com.serone.desktoplabel.txt
+++ b/metadata/com.serone.desktoplabel.txt
@@ -9,8 +9,8 @@ Description:
 Allows you to add custom widgets to your 'desktop' to label things.
 .
 
-Repo Type:git-svn
-Repo:http://desktoplabel.googlecode.com/svn/trunk/
+Repo Type:svn
+Repo:http://desktoplabel.googlecode.com/svn/DesktopLabel
 
 Build Version:1.4.0,7,16
 
diff --git a/metadata/com.uploadedlobster.PwdHash.txt b/metadata/com.uploadedlobster.PwdHash.txt
index 73c49e9b58..c694210909 100644
--- a/metadata/com.uploadedlobster.PwdHash.txt
+++ b/metadata/com.uploadedlobster.PwdHash.txt
@@ -13,4 +13,5 @@ Lightweight tool to generate website specific, theft-resistant passwords. Just u
 Repo Type:git
 Repo:https://github.com/phw/Android-PwdHash.git
 
-Build Version:1.2.4,7,069d5044
+Build Version:1.3.0,9,1.3.0
+
diff --git a/metadata/com.zoffcc.applications.zanavi.txt b/metadata/com.zoffcc.applications.zanavi.txt
index b7cc5e530f..9d41f2c336 100644
--- a/metadata/com.zoffcc.applications.zanavi.txt
+++ b/metadata/com.zoffcc.applications.zanavi.txt
@@ -25,4 +25,5 @@ Features include:
 Repo Type:git-svn
 Repo:http://zanavi.cc/zanavi_public1/navit
 
-Build Version:1.0.52
+#......
+#Build Version:1.0.52
diff --git a/metadata/de.antonfluegge.android.yubnubwidgetadfree.txt b/metadata/de.antonfluegge.android.yubnubwidgetadfree.txt
index 9da8c5d88e..9d85e8a0f2 100644
--- a/metadata/de.antonfluegge.android.yubnubwidgetadfree.txt
+++ b/metadata/de.antonfluegge.android.yubnubwidgetadfree.txt
@@ -13,4 +13,5 @@ Yubnub is a social command line for the web. By typing short commands into the w
 Repo Type:git
 Repo:git://git.code.sf.net/p/yubnubapp/code
 
-Build Version:1.1.4,6,bb92bd86a
+#Doesn't build, looks like missing source/dependencies...
+#Build Version:1.1.4,6,bb92bd86a,subdir=yubnubapp-code
diff --git a/metadata/de.kugihan.dictionaryformids.hmi_android.txt b/metadata/de.kugihan.dictionaryformids.hmi_android.txt
index 587a4b1896..eb29c6b669 100644
--- a/metadata/de.kugihan.dictionaryformids.hmi_android.txt
+++ b/metadata/de.kugihan.dictionaryformids.hmi_android.txt
@@ -14,7 +14,8 @@ Beyond language dictionaries, it is possible to set up any other dictionary for
 Please note that the dictionaries that are set up for DictionaryForMIDs may have different copyrights. All dictionaries that can be downloaded from the website are free to use. Several dictionaries come with the app and more are provided in the section dictionaries for download of the website.
 .
 
-Repo Type:git-svn
-Repo:http://dictionarymid.sourceforge.net/android-dl.html
+#Not valid....
+#Repo Type:git-svn
+#Repo:http://dictionarymid.sourceforge.net/android-dl.html
 
-Build Version:0.90.1,89,r461
+#Build Version:0.90.1,89,461
diff --git a/metadata/es.cesar.quitesleep.txt b/metadata/es.cesar.quitesleep.txt
index 625959f9ed..2bd08fe5af 100644
--- a/metadata/es.cesar.quitesleep.txt
+++ b/metadata/es.cesar.quitesleep.txt
@@ -22,7 +22,9 @@ Repo:https://code.google.com/p/quitesleep/
 
 Build Version:2.0,5,fbf8f2db2b36,prebuild=rm -rf libs && mv lib libs
 Build Version:2.0.3,9,619ef22277cc,prebuild=rm -rf libs && mv lib libs
-Build Version:3,13,0a3dcf9b9c25 
+
+#Needs ActionBarSherlock srclib setup
+#Build Version:3,13,0a3dcf9b9c25,subdir=quitesleep3,prebuild=rm -rf libs && mv lib libs
 
 Update Check Mode:Market
 Current Version:3
diff --git a/metadata/eu.domob.anacam.txt b/metadata/eu.domob.anacam.txt
index 882c8c9989..6f8980f76c 100644
--- a/metadata/eu.domob.anacam.txt
+++ b/metadata/eu.domob.anacam.txt
@@ -17,7 +17,7 @@ best position for the second picture before you take it.
 Repo Type:git-svn
 Repo:svn://svn.code.sf.net/p/anacam/code/trunk
 
-Build Version:1.0,10000,28,buildjni=no
+Build Version:1.0,10000,28,buildjni=no,prebuild=sed -i 's@ndk-build@${ndk.dir}/ndk-build@' custom_rules.xml
 
 Update Check Mode:None
 Current Version:1.0
diff --git a/metadata/kaljurand_at_gmail_dot_com.diktofon.txt b/metadata/kaljurand_at_gmail_dot_com.diktofon.txt
index 10bffc01e2..c36d1b89f7 100644
--- a/metadata/kaljurand_at_gmail_dot_com.diktofon.txt
+++ b/metadata/kaljurand_at_gmail_dot_com.diktofon.txt
@@ -19,4 +19,5 @@ The Diktofon app provides also language independent features like tagging, high
 Repo Type:git
 Repo:https://github.com/Kaljurand/Diktofon.git
 
-Build Version:0.9.76,976,8036d6c7
+#Missing dependencies (and possibly proprietary)
+#Build Version:0.9.76,976,8036d6c7,subdir=app
diff --git a/metadata/me.shkschneider.dropbearserver.txt b/metadata/me.shkschneider.dropbearserver.txt
index 5e12cb4563..eba69bfdb1 100644
--- a/metadata/me.shkschneider.dropbearserver.txt
+++ b/metadata/me.shkschneider.dropbearserver.txt
@@ -1,3 +1,4 @@
+Disabled:Can't build properly (yet?) - see comment
 #there are dropbear binaries in the repo from an external source but they can be built
 #from https://github.com/shkschneider/android_external_dropbear . 
 
@@ -33,7 +34,6 @@ Requires Root:Yes
 Repo Type:git
 Repo:https://github.com/shkschneider/android_DropBearServer.git
 
-#Generated by import.py - check this is the right version, and find the right commit!
 Build Version:1.7.0,170,b943a751dc
 
 Update Check Mode:Market
diff --git a/metadata/mobi.cyann.nstools.txt b/metadata/mobi.cyann.nstools.txt
index e131417a49..b3e7b7fa67 100644
--- a/metadata/mobi.cyann.nstools.txt
+++ b/metadata/mobi.cyann.nstools.txt
@@ -14,4 +14,5 @@ Root Required:Yes
 Repo Type:git
 Repo:https://github.com/arifhn/NSTools.git
 
-Build Version:1.16,20,caa8eec7
+#Missing dependencies, should be easy to solve, they are already in our extlib
+#Build Version:1.16,20,caa8eec7
diff --git a/metadata/net.jaqpot.netcounter.txt b/metadata/net.jaqpot.netcounter.txt
index eb6244a2cc..7ed968f415 100644
--- a/metadata/net.jaqpot.netcounter.txt
+++ b/metadata/net.jaqpot.netcounter.txt
@@ -11,10 +11,11 @@ to you in an easy to read format. It can also alert you when you reach a predefi
 limit.
 .
 
-Repo Type:git-svn
-Repo:https://www.jaqpot.net/svn/android/netcounter/trunk 
+#Not valid...
+#Repo Type:git-svn
+#Repo:https://www.jaqpot.net/svn/android/netcounter/trunk 
 
-Build Version:0.14.1,22,153
+#Build Version:0.14.1,22,153
 
 Update Check Mode:Market
 Current Version:0.14.1
diff --git a/metadata/net.osmand.plus.txt b/metadata/net.osmand.plus.txt
index 1e0d180f11..78692253dd 100644
--- a/metadata/net.osmand.plus.txt
+++ b/metadata/net.osmand.plus.txt
@@ -3,7 +3,7 @@ License:LGPL
 Web Site:http://code.google.com/p/osmand/
 Source Code:https://github.com/osmandapp/Osmand
 Issue Tracker:http://code.google.com/p/osmand/issues/list
-Donation:https://www.paypal.com/us/cgi-bin/webscr?cmd=_flow&SESSION=Vf3sHQ7L04cDtH85Y50oV6iGrMczL-knML1tuAbtUoNJ96-3axviegypjVi&dispatch=5885d80a13c0db1f8e263663d3faee8d8494db9703d295b4a2116480ee01a05c
+Donate:https://www.paypal.com/us/cgi-bin/webscr?cmd=_flow&SESSION=Vf3sHQ7L04cDtH85Y50oV6iGrMczL-knML1tuAbtUoNJ96-3axviegypjVi&dispatch=5885d80a13c0db1f8e263663d3faee8d8494db9703d295b4a2116480ee01a05c
 
 Name:OsmAnd+
 Summary:OpenStreetMap navigation & routing
diff --git a/metadata/net.osmand.txt b/metadata/net.osmand.txt
index 1dc13f2718..a7fd8f4c36 100644
--- a/metadata/net.osmand.txt
+++ b/metadata/net.osmand.txt
@@ -3,7 +3,7 @@ License:LGPL
 Web Site:http://code.google.com/p/osmand/
 Source Code:https://github.com/osmandapp/Osmand
 Issue Tracker:http://code.google.com/p/osmand/issues/list
-Donation:https://www.paypal.com/us/cgi-bin/webscr?cmd=_flow&SESSION=Vf3sHQ7L04cDtH85Y50oV6iGrMczL-knML1tuAbtUoNJ96-3axviegypjVi&dispatch=5885d80a13c0db1f8e263663d3faee8d8494db9703d295b4a2116480ee01a05c
+Donate:https://www.paypal.com/us/cgi-bin/webscr?cmd=_flow&SESSION=Vf3sHQ7L04cDtH85Y50oV6iGrMczL-knML1tuAbtUoNJ96-3axviegypjVi&dispatch=5885d80a13c0db1f8e263663d3faee8d8494db9703d295b4a2116480ee01a05c
 
 Summary:OpenStreetMap navigation & routing
 Description:
diff --git a/metadata/net.sourceforge.servestream.txt b/metadata/net.sourceforge.servestream.txt
index cf3a994d4e..19c20a697f 100644
--- a/metadata/net.sourceforge.servestream.txt
+++ b/metadata/net.sourceforge.servestream.txt
@@ -23,7 +23,7 @@ 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,1050,prebuild=mv lib/ libs/
+Build Version:0.4.9,59,1049,buildjni=no
 
 Update Check Mode:Market
 Current Version:0.4.9
diff --git a/metadata/org.andnav.osm.txt b/metadata/org.andnav.osm.txt
index 56c28862e2..dd513dda82 100644
--- a/metadata/org.andnav.osm.txt
+++ b/metadata/org.andnav.osm.txt
@@ -12,7 +12,8 @@ Map viewer using OpenStreetMap tiles.
 Repo Type:git-svn
 Repo:http://osmdroid.googlecode.com/svn/trunk/
 
-Build Version:3.0.9,10,1098
+#Doesn't build - needs lots of work on building dependencies
+#Build Version:3.0.9,10,1098,subdir=OpenStreetMapViewer
 
 Update Check Mode:Market
 Current Version:2.0.0
diff --git a/metadata/org.aprsdroid.app.txt b/metadata/org.aprsdroid.app.txt
index dd64514201..373b0dd548 100644
--- a/metadata/org.aprsdroid.app.txt
+++ b/metadata/org.aprsdroid.app.txt
@@ -13,4 +13,5 @@ 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
 
-Build Version:1.2.0,10,6060f53846
+#Missing AudioBufferProcessor.java...
+#Build Version:1.2.0,10,6060f53846
diff --git a/metadata/org.geometerplus.zlibrary.ui.android.txt b/metadata/org.geometerplus.zlibrary.ui.android.txt
index 6cc1187aeb..d523079fc2 100644
--- a/metadata/org.geometerplus.zlibrary.ui.android.txt
+++ b/metadata/org.geometerplus.zlibrary.ui.android.txt
@@ -33,7 +33,8 @@ Build Version:1.2.4,102041,6426bcf131d4,buildjni=yes,target=android-10,prebuild=
 Build Version:1.2.6,102061,1.2.6,buildjni=yes,target=android-10,prebuild=mkdir res/drawable && find icons -iname "*.*" -exec cp {} res/drawable \;
 Build Version:1.3.3,103031,1.3.3,buildjni=yes,target=android-10,prebuild=mkdir res/drawable && find icons -iname "*.*" -exec cp {} res/drawable \;
 Build Version:1.3.6,103061,a16e3eb7ff731edea99248f8a7c1633148a26236,buildjni=yes,target=android-10,prebuild=mkdir res/drawable && find icons -iname "*.*" -exec cp {} res/drawable \;
-Build Version:1.5.5,105051,2fe2ee64c230165b05dd62a7a37d15bce13972ee
+#Doesn't build...
+#Build Version:1.5.5,105051,2fe2ee64c230165b05dd62a7a37d15bce13972ee
 
 Update Check Mode:None
 Current Version:1.5.5
diff --git a/metadata/org.helllabs.android.xmp.txt b/metadata/org.helllabs.android.xmp.txt
index cf1076cc6d..25d0fa1baf 100644
--- a/metadata/org.helllabs.android.xmp.txt
+++ b/metadata/org.helllabs.android.xmp.txt
@@ -24,7 +24,8 @@ forceversion=yes
 Build Version:2.9.0,21,03a9c9c9d5acf3b1b659e407c18d072309d50e3a,\
 init=cd ../../ && autoconf && ./configure,buildjni=yes,subdir=players/android,target=android-14,\
 forceversion=yes
-Build Version:3.2.0,30,2c7b8dd28dff53b876ad19498d0f634805fd0a2e
+#Needs work to build...
+#Build Version:3.2.0,30,2c7b8dd28dff53b876ad19498d0f634805fd0a2
 
 Update Check Mode:Market
 Current Version:3.2.1
diff --git a/metadata/org.hermit.netscramble.txt b/metadata/org.hermit.netscramble.txt
index 7a9e58ed32..b8393768f8 100644
--- a/metadata/org.hermit.netscramble.txt
+++ b/metadata/org.hermit.netscramble.txt
@@ -11,11 +11,6 @@ the network randomly rotated and must rotate them to connect all the terminals
 to the server. A port of the KDE game "knetwalk".
 .
 
-Repo Type:git-svn
-Repo:http://moonblink.googlecode.com/svn/trunk/
-
-Build Version:5.0.2,28,r1004,subdir="Scrambled Net Lite"
-
 Update Check Mode:Market
 Current Version:5.0.2
 Current Version Code:28
diff --git a/metadata/org.liberty.android.fantastischmemo.txt b/metadata/org.liberty.android.fantastischmemo.txt
index e9e2f946ca..5cd550d400 100644
--- a/metadata/org.liberty.android.fantastischmemo.txt
+++ b/metadata/org.liberty.android.fantastischmemo.txt
@@ -15,7 +15,9 @@ 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
-Build Version:9.0.10,160,2da472cae9a732a8ad1144a93ab7e83201b8f0a6
+#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
diff --git a/metadata/org.mariotaku.twidere.txt b/metadata/org.mariotaku.twidere.txt
new file mode 100644
index 0000000000..98c8d2a77b
--- /dev/null
+++ b/metadata/org.mariotaku.twidere.txt
@@ -0,0 +1,21 @@
+Category:Internet
+License:GPLv3
+Web Site:https://github.com/mariotaku/twidere/
+Source Code:https://github.com/mariotaku/twidere/
+Issue Tracker:https://github.com/mariotaku/twidere/issues
+
+Summary:Twidere for Twitter & Identi.ca.
+Description:
+Twitter and Identi.ca client, with many powerful features.
+.
+
+Repo Type:git
+Repo:git://github.com/mariotaku/twidere.git
+
+#Can't get this to build - error as follows:
+#StatusComposeEditText.java:70: type parameters of <T>void cannot be determined; no unique maximal instance exists for type variable T with upper bounds android.widget.ListAdapter,android.widget.Filterable
+#Build Version:0.1.1,28,50c9bc94151904f12963d114e0afdd2aa9691fb5,target=Google Inc.:Google APIs:16
+
+Update Check Mode:Market
+Current Version:0.1.0 update5
+Current Version Code:27
diff --git a/metadata/org.scoutant.blokish.txt b/metadata/org.scoutant.blokish.txt
index 9debdebf8d..1bb9025318 100644
--- a/metadata/org.scoutant.blokish.txt
+++ b/metadata/org.scoutant.blokish.txt
@@ -17,7 +17,7 @@ Build Version:1.4,7,82ca58cdd26797f9ba9519e79c54031282d066af,target=android-10
 Build Version:1.5,8,e6ab83e8832f03d78bf3f8deae33acb22a7ba520,target=android-10
 Build Version:1.6,9,ebd1b966b70e,target=android-10
 Build Version:1.7,10,!requires proprietary "heyzap" library
-Build Version:1.8,11,a297e22247bb1ef7ecd4e764124703488354626d
+Build Version:1.8,11,a297e22247bb1ef7ecd4e764124703488354626d,target=android-10
 
 Update Check Mode:None
 Current Version:1.8
diff --git a/metadata/org.sipdroid.sipua.txt b/metadata/org.sipdroid.sipua.txt
index 4df86e2510..a96190c5db 100644
--- a/metadata/org.sipdroid.sipua.txt
+++ b/metadata/org.sipdroid.sipua.txt
@@ -9,11 +9,6 @@ Description:
 A SIP (VOIP) client with video calling capabilities.
 .
 
-Repo Type:git-svn
-Repo:http://sipdroid.googlecode.com/svn/trunk/ 
-
-Build Version:2.7 beta,90,624
-
 Update Check Mode:Market
 Current Version:2.7
 Current Version Code:90
diff --git a/metadata/org.thialfihar.android.apg.txt b/metadata/org.thialfihar.android.apg.txt
index e0cfcf9ed1..cd84ff0c8b 100644
--- a/metadata/org.thialfihar.android.apg.txt
+++ b/metadata/org.thialfihar.android.apg.txt
@@ -1,7 +1,7 @@
 Category:Internet
 License:Apache2
 Web Site:http://code.google.com/p/android-privacy-guard/
-Source Code:https://github.com/thialfihar/apg
+Source Code:http://code.google.com/p/android-privacy-guard/source/checkout
 Issue Tracker:http://code.google.com/p/android-privacy-guard/issues/list
 FlattrID:164412
 
@@ -12,14 +12,6 @@ conjunction with K-9 Mail, to seamlessly add support for encyrpting and decrypti
 emails, as well as adding and verifying digital signatures.
 .
 
-Repo Type:git
-Repo:https://github.com/thialfihar/apg.git
-
-Build Version:1.0.7,21,bd99b2590b9b619d90ce5ffe36d5526452883cbf
-##N.B an apk of 1.0.7 is in the app repository
-##To build: Execute "ant -Dsdk.dir=/opt/android-sdk/ release" with the appropriate paths. 
-## Alternatively you could add a file local.properties with the following lines, altered to your locations of  the SDK:sdk.dir=/opt/android-sdk and execute "ant release" 
-
 Update Check Mode:Market
 Current Version:1.0.8
 Current Version Code:10899
diff --git a/metadata/org.torproject.android.txt b/metadata/org.torproject.android.txt
index 5cda36093a..7236166aed 100644
--- a/metadata/org.torproject.android.txt
+++ b/metadata/org.torproject.android.txt
@@ -3,7 +3,7 @@ License:BSD
 Web Site:http://www.torproject.org/docs/android.html.en
 Source Code:https://svn.torproject.org/svn/projects/android/
 Issue Tracker:https://trac.torproject.org/projects/tor
-Donation:https://www.torproject.org/donate/donate.html.en
+Donate:https://www.torproject.org/donate/donate.html.en
 
 Summary:Tor (anonymity) client
 Description:
diff --git a/metadata/se.sandos.android.delayed.txt b/metadata/se.sandos.android.delayed.txt
index c2e6e7f555..b1827eabc1 100644
--- a/metadata/se.sandos.android.delayed.txt
+++ b/metadata/se.sandos.android.delayed.txt
@@ -13,4 +13,4 @@ Description:
 Repo Type:hg
 Repo:https://code.google.com/p/android-delayed/
 
-Build Version:0.9-BETA5,18,d89732dab
+Build Version:0.9-BETA5,18,d89732dab,target=android-15
diff --git a/metadata/sk.baka.aedict.txt b/metadata/sk.baka.aedict.txt
index ca87d8c520..3e748c7246 100644
--- a/metadata/sk.baka.aedict.txt
+++ b/metadata/sk.baka.aedict.txt
@@ -31,4 +31,5 @@ Allows automatic download of a German/French EDict, the names dictionary and the
 Repo Type:hg
 Repo:https://code.google.com/p/aedict/
 
-Build Version:2.10,2100,df770685
+#Doesn't build, needs work...
+#Build Version:2.10,2100,df770685
diff --git a/stats/known_apks.txt b/stats/known_apks.txt
index 4a18924057..3a1846ebf4 100644
--- a/stats/known_apks.txt
+++ b/stats/known_apks.txt
@@ -123,6 +123,7 @@ alogcat-2.1.4.apk org.jtb.alogcat 2010-11-21
 andLess_05202011.apk net.avs234 2011-05-20
 android.androidVNC_13.apk android.androidVNC 2011-04-06
 android.game.prboom_31.apk android.game.prboom 2012-03-10
+android.tether_26.apk android.tether 2012-07-26
 androidVNC_build20100725.apk android.androidVNC 2010-11-18
 apps.droidnotify_27.apk apps.droidnotify 2012-01-21
 apps.droidnotify_29.apk apps.droidnotify 2012-01-28
@@ -143,6 +144,7 @@ com.addi_37.apk com.addi 2012-02-25
 com.addi_40.apk com.addi 2012-02-25
 com.addi_44.apk com.addi 2012-05-12
 com.agiro.scanner.android_2.apk com.agiro.scanner.android 2011-01-27
+com.alfray.asqare_103.apk com.alfray.asqare 2012-07-26
 com.alfray.timeriffic_10903.apk com.alfray.timeriffic 2010-11-13
 com.alfray.timeriffic_10905.apk com.alfray.timeriffic 2011-01-31
 com.andrewshu.android.reddit_67.apk com.andrewshu.android.reddit 2011-01-15
@@ -171,6 +173,7 @@ com.angrydoughnuts.android.alarmclock_8.apk com.angrydoughnuts.android.alarmcloc
 com.anoshenko.android.mahjongg_14.apk com.anoshenko.android.mahjongg 2012-02-12
 com.appengine.paranoid_android.lost_12.apk com.appengine.paranoid_android.lost 2012-01-08
 com.ath0.rpn_10.apk com.ath0.rpn 2012-02-11
+com.ath0.rpn_15.apk com.ath0.rpn 2012-07-26
 com.ath0.rpn_9.apk com.ath0.rpn 2012-02-10
 com.axelby.podax_12.apk com.axelby.podax 2012-01-21
 com.axelby.podax_14.apk com.axelby.podax 2012-03-20
@@ -184,6 +187,7 @@ com.beem.project.beem_7.apk com.beem.project.beem 2011-02-03
 com.beem.project.beem_9.apk com.beem.project.beem 2012-01-10
 com.boardgamegeek_20.apk com.boardgamegeek 2011-09-26
 com.boardgamegeek_21.apk com.boardgamegeek 2011-12-31
+com.brocktice.JustSit_17.apk com.brocktice.JustSit 2012-07-26
 com.bwx.bequick_201012060.apk com.bwx.bequick 2011-01-29
 com.bwx.bequick_201106160.apk com.bwx.bequick 2011-06-29
 com.bwx.bequick_201107260.apk com.bwx.bequick 2011-08-09
@@ -233,6 +237,7 @@ com.ghostsq.commander_163.apk com.ghostsq.commander 2012-02-06
 com.ghostsq.commander_164.apk com.ghostsq.commander 2012-02-15
 com.ghostsq.commander_94.apk com.ghostsq.commander 2011-04-02
 com.ghostsq.commander_97.apk com.ghostsq.commander 2011-04-02
+com.glTron_4.apk com.glTron 2012-07-26
 com.google.android.diskusage_2004.apk com.google.android.diskusage 2011-01-31
 com.google.android.diskusage_2005.apk com.google.android.diskusage 2011-03-10
 com.google.android.diskusage_2103.apk com.google.android.diskusage 2011-05-16
@@ -273,6 +278,7 @@ com.ichi2.anki_26.apk com.ichi2.anki 2012-05-08
 com.ichi2.anki_29.apk com.ichi2.anki 2012-06-27
 com.ihunda.android.binauralbeat_24.apk com.ihunda.android.binauralbeat 2012-02-11
 com.jadn.cc_129.apk com.jadn.cc 2012-01-07
+com.jotabout.screeninfo.Screeninfo_103.apk com.jotabout.screeninfo 2012-07-05
 com.kmagic.solitaire_450.apk com.kmagic.solitaire 2011-01-23
 com.kostmo.wallpaper.spiral_12.apk com.kostmo.wallpaper.spiral 2012-03-23
 com.leinardi.kitchentimer_116.apk com.leinardi.kitchentimer 2012-01-28
@@ -299,6 +305,10 @@ com.morphoss.acal_35.apk com.morphoss.acal 2012-01-03
 com.morphoss.acal_36.apk com.morphoss.acal 2012-01-09
 com.morphoss.acal_37.apk com.morphoss.acal 2012-01-15
 com.morphoss.acal_38.apk com.morphoss.acal 2012-01-20
+com.morphoss.acal_53.apk com.morphoss.acal 2012-07-06
+com.morphoss.acal_54.apk com.morphoss.acal 2012-07-06
+com.morphoss.acal_55.apk com.morphoss.acal 2012-07-12
+com.morphoss.acal_56.apk com.morphoss.acal 2012-07-21
 com.mp3tunes.android.player_89.apk com.mp3tunes.android.player 2011-04-09
 com.namelessdev.mpdroid_20.apk com.namelessdev.mpdroid 2012-01-29
 com.nexes.manager_212.apk com.nexes.manager 2011-03-09
@@ -310,7 +320,9 @@ com.replica.replicaisland_14.apk com.replica.replicaisland 2011-03-03
 com.ringdroid_20500.apk com.ringdroid 2011-03-26
 com.roozen.SoundManager_18.apk com.roozen.SoundManager 2011-03-03
 com.scottmain.android.searchlight_1.apk com.scottmain.android.searchlight 2012-01-27
+com.scottmain.android.searchlight_4.apk com.scottmain.android.searchlight 2012-07-26
 com.seavenois.tetris_1.apk com.seavenois.tetris 2012-03-10
+com.serone.desktoplabel_7.apk com.serone.desktoplabel 2012-07-26
 com.showmehills_2.apk com.showmehills 2012-05-29
 com.showmehills_4.apk com.showmehills 2012-05-29
 com.smorgasbork.hotdeath_3.apk com.smorgasbork.hotdeath 2011-12-06
@@ -327,6 +339,7 @@ com.totsp.bookworm_18.apk com.totsp.bookworm 2011-01-27
 com.totsp.bookworm_19.apk com.totsp.bookworm 2011-05-04
 com.totsp.crossword.shortyz_30100.apk com.totsp.crossword.shortyz 2012-01-08
 com.unitedcoders.android.gpodroid_12.apk com.unitedcoders.android.gpodroid 2012-01-08
+com.uploadedlobster.PwdHash_9.apk com.uploadedlobster.PwdHash 2012-07-21
 com.voidcode.diasporawebclient_10.apk com.voidcode.diasporawebclient 2012-04-08
 com.voidcode.diasporawebclient_3.apk com.voidcode.diasporawebclient 2011-12-08
 com.voidcode.diasporawebclient_6.apk com.voidcode.diasporawebclient 2012-01-28
@@ -350,6 +363,7 @@ cz.romario.opensudoku_1104.apk cz.romario.opensudoku 2012-01-12
 cz.romario.opensudoku_1105.apk cz.romario.opensudoku 2012-01-12
 de.blau.android.Application_14.apk de.blau.android
 de.blau.android_14.apk de.blau.android 2012-05-16
+de.danielweisser.android.ldapsync_12.apk de.danielweisser.android.ldapsync 2012-07-26
 de.delusions.measure_9.apk de.delusions.measure 2012-03-23
 de.duenndns.gmdice_6.apk de.duenndns.gmdice 2012-04-20
 de.fmaul.android.cmis_8.apk de.fmaul.android.cmis 2012-03-10
@@ -389,6 +403,8 @@ edu.nyu.cs.omnidroid.app_6.apk edu.nyu.cs.omnidroid.app 2011-10-04
 edu.rit.poe.atomix_2.apk edu.rit.poe.atomix 2011-03-02
 es.cesar.quitesleep_5.apk es.cesar.quitesleep 2012-03-02
 es.cesar.quitesleep_9.apk es.cesar.quitesleep 2012-03-02
+eu.domob.anacam_10000.apk eu.domob.anacam 2012-07-14
+eu.domob.angulo_10100.apk eu.domob.angulo 2012-07-11
 fennec-10.0.1.multi.android-arm.apk org.mozilla.firefox 2012-02-14
 fennec-10.0.2.multi.android-arm.apk org.mozilla.firefox 2012-02-21
 fennec-10.0.3esr.multi.android-arm.apk org.mozilla.firefox 2012-03-15
@@ -402,7 +418,9 @@ fennec-6.0.multi.eabi-arm.apk org.mozilla.firefox
 fennec-9.0.multi.android-arm.apk org.mozilla.firefox 2012-01-19
 fm.libre.droid_3.apk fm.libre.droid 2010-11-12
 fm.libre.droid_4.apk fm.libre.droid 2010-11-12
+fr.keuse.rightsalert_1.apk fr.keuse.rightsalert 2012-07-05
 fr.keuse.rightsalert_2.apk fr.keuse.rightsalert 2012-05-08
+fr.keuse.rightsalert_3.apk fr.keuse.rightsalert 2012-07-05
 fr.seeks_4.apk fr.seeks 2011-05-04
 goo.TeaTimer_9.apk goo.TeaTimer 2011-05-18
 gvSIG_Mini_1_0_0_SDK16.apk es.prodevelop.gvsig.mini 2010-10-21
@@ -411,6 +429,7 @@ gvSIG_Mini_1_2_2_SDK16-456.apk es.prodevelop.gvsig.mini 2011-03-28
 gvsig-2.0-alpha.apk es.prodevelop.gvsig.mini 2012-04-08
 httpmon.apk org.jtb.httpmon 2010-11-21
 httpmon_0.4.10.apk org.jtb.httpmon
+in.shick.diode_5.apk in.shick.diode 2012-07-01
 in.shick.lockpatterngenerator_6.apk in.shick.lockpatterngenerator 2012-06-21
 info.guardianproject.browser_3.apk info.guardianproject.browser 2011-12-07
 info.guardianproject.cacert_3.apk info.guardianproject.cacert 2011-10-03
@@ -452,6 +471,7 @@ li.klass.fhem_58.apk li.klass.fhem 2012-04-20
 linphone-android-1.0.15.apk org.linphone 2010-11-16
 linphone-android-1.1.6.apk org.linphone
 linphone-android-1.2.1.apk org.linphone 2011-09-29
+linphone-android-1.3.2.apk org.linphone 2012-07-21
 me.guillaumin.android.osmtracker_20.apk me.guillaumin.android.osmtracker 2011-07-03
 me.guillaumin.android.osmtracker_21.apk me.guillaumin.android.osmtracker 2011-10-02
 me.guillaumin.android.osmtracker_22.apk me.guillaumin.android.osmtracker 2012-02-05
@@ -460,6 +480,7 @@ mixare-0062.apk org.mixare
 mixare-0063.apk org.mixare
 mixare-v082.apk org.mixare 2012-05-17
 mixedbit.speechtrainer_2.apk mixedbit.speechtrainer 2011-11-28
+mixedbit.speechtrainer_5.apk mixedbit.speechtrainer 2012-07-26
 mobileorg-release.apk com.matburt.mobileorg 2011-02-19
 mustard-0.1.10.apk org.mustard.android
 mustard-0.1.12b.apk org.mustard.android
@@ -527,6 +548,7 @@ net.rocrail.androc_345.apk net.rocrail.androc 2012-05-12
 net.rocrail.androc_347.apk net.rocrail.androc 2012-05-28
 net.rocrail.androc_348.apk net.rocrail.androc 2012-06-07
 net.rocrail.androc_350.apk net.rocrail.androc 2012-06-21
+net.rocrail.androc_351.apk net.rocrail.androc 2012-07-12
 net.sf.andbatdog.batterydog_11.apk net.sf.andbatdog.batterydog 2011-04-02
 net.sourceforge.servestream_35.apk net.sourceforge.servestream 2011-03-30
 net.sourceforge.servestream_46.apk net.sourceforge.servestream 2011-08-02
@@ -535,6 +557,7 @@ net.sourceforge.servestream_54.apk net.sourceforge.servestream 2012-01-19
 net.sourceforge.servestream_56.apk net.sourceforge.servestream 2012-02-21
 net.sourceforge.servestream_57.apk net.sourceforge.servestream 2012-03-21
 net.sourceforge.servestream_58.apk net.sourceforge.servestream 2012-03-27
+net.sourceforge.servestream_59.apk net.sourceforge.servestream 2012-07-26
 net.sylvek.sharemyposition_16.apk net.sylvek.sharemyposition 2011-02-03
 net.sylvek.sharemyposition_20.apk net.sylvek.sharemyposition 2012-01-10
 net.sylvek.sharemyposition_24.apk net.sylvek.sharemyposition 2012-01-27
@@ -574,6 +597,7 @@ org.androidsoft.games.memory.kids_13.apk org.androidsoft.games.memory.kids 2011-
 org.androidsoft.games.memory.kids_14.apk org.androidsoft.games.memory.kids 2012-04-06
 org.bc_bd.mrwhite_1.apk org.bc_bd.mrwhite 2012-03-15
 org.bc_bd.mrwhite_2.apk org.bc_bd.mrwhite 2012-06-07
+org.beide.bomber_1.apk org.beide.bomber 2012-07-10
 org.birthdayadapter_1.apk org.birthdayadapter 2012-04-05
 org.birthdayadapter_2.apk org.birthdayadapter 2012-04-08
 org.birthdayadapter_3.apk org.birthdayadapter 2012-05-13
@@ -646,6 +670,8 @@ org.fox.ttrss_71.apk org.fox.ttrss 2012-03-15
 org.fox.ttrss_72.apk org.fox.ttrss 2012-03-23
 org.fox.ttrss_74.apk org.fox.ttrss 2012-06-21
 org.fox.ttrss_83.apk org.fox.ttrss 2012-06-27
+org.fox.ttrss_85.apk org.fox.ttrss 2012-07-06
+org.fox.ttrss_86.apk org.fox.ttrss 2012-07-12
 org.geometerplus.zlibrary.ui.android_10011.apk org.geometerplus.zlibrary.ui.android 2011-04-26
 org.geometerplus.zlibrary.ui.android_10013.apk org.geometerplus.zlibrary.ui.android 2011-05-16
 org.geometerplus.zlibrary.ui.android_10014.apk org.geometerplus.zlibrary.ui.android 2011-05-18
@@ -703,6 +729,7 @@ org.mythdroid_53.apk org.mythdroid 2012-01-06
 org.nerdcircus.android.klaxon_27.apk org.nerdcircus.android.klaxon 2012-02-04
 org.ntpsync_1.apk org.ntpsync 2012-05-19
 org.ntpsync_2.apk org.ntpsync 2012-06-07
+org.opengpx_236.apk org.opengpx 2012-07-13
 org.openintents.filemanager_18.apk org.openintents.filemanager 2012-02-03
 org.openintents.newsreader_65549.apk org.openintents.newsreader 2012-01-30
 org.paulmach.textedit_12.apk org.paulmach.textedit 2011-01-27
@@ -715,7 +742,11 @@ org.pocketworkstation.pckeyboard_1020.apk org.pocketworkstation.pckeyboard 2011-
 org.pocketworkstation.pckeyboard_1022.apk org.pocketworkstation.pckeyboard 2011-10-02
 org.pocketworkstation.pckeyboard_1029.apk org.pocketworkstation.pckeyboard 2012-01-15
 org.pocketworkstation.pckeyboard_1031.apk org.pocketworkstation.pckeyboard 2012-02-26
+org.pocketworkstation.pckeyboard_1033.apk org.pocketworkstation.pckeyboard 2012-07-12
+org.projectvoodoo.simplecarrieriqdetector_16.apk org.projectvoodoo.simplecarrieriqdetector 2012-07-26
+org.pyload.android.client_12.apk org.pyload.android.client 2012-07-13
 org.scoutant.blokish_1.apk org.scoutant.blokish 2011-08-25
+org.scoutant.blokish_11.apk org.scoutant.blokish 2012-07-26
 org.scoutant.blokish_7.apk org.scoutant.blokish 2011-11-27
 org.scoutant.blokish_8.apk org.scoutant.blokish 2011-11-27
 org.scoutant.blokish_9.apk org.scoutant.blokish 2011-12-31
@@ -773,6 +804,8 @@ org.wikipedia_16.apk org.wikipedia 2012-06-18
 org.wikipedia_17.apk org.wikipedia 2012-06-21
 org.wikipedia_3.apk org.wikipedia 2012-01-26
 org.wikipedia_4.apk org.wikipedia 2012-02-03
+org.wiktionary_1.apk org.wiktionary 2012-07-14
+org.woltage.irssiconnectbot_393.apk org.woltage.irssiconnectbot 2012-07-02
 org.wordpress.android_31.apk org.wordpress.android 2011-01-26
 org.wordpress.android_33.apk org.wordpress.android 2011-07-01
 org.wordpress.android_45.apk org.wordpress.android 2012-02-15
@@ -815,6 +848,7 @@ se.johanhil.clipboard_2.apk se.johanhil.clipboard 2011-03-10
 se.johanhil.duckduckgo_1.apk se.johanhil.duckduckgo 2011-03-10
 se.peterbjorkman.android.trafikinfo_12.apk se.peterbjorkman.android.trafikinfo 2011-01-27
 se.peterbjorkman.android.trafikinfo_13.apk se.peterbjorkman.android.trafikinfo 2011-02-02
+se.sandos.android.delayed_18.apk se.sandos.android.delayed 2012-07-26
 sms-backup-plus-v1.2.apk com.zegoggles.smssync 2010-11-19
 sms-backup-plus-v1.3.2.apk com.zegoggles.smssync
 sms-backup-plus-v1.3.3.apk com.zegoggles.smssync
@@ -841,6 +875,7 @@ vu.de.urpool.quickdroid_31.apk vu.de.urpool.quickdroid 2011-01-27
 vu.de.urpool.quickdroid_37.apk vu.de.urpool.quickdroid 2011-03-10
 vu.de.urpool.quickdroid_38.apk vu.de.urpool.quickdroid 2011-05-16
 vu.de.urpool.quickdroid_42.apk vu.de.urpool.quickdroid 2012-06-07
+wb.receiptspro_12.apk wb.receiptspro 2012-07-01
 yaaic-0.5.apk org.yaaic 2010-10-21
 yaaic-0.6.1.apk org.yaaic
 yaaic-0.6.apk org.yaaic
diff --git a/stats/latestapps.txt b/stats/latestapps.txt
index b48d71b1ec..89a0be0e69 100644
--- a/stats/latestapps.txt
+++ b/stats/latestapps.txt
@@ -1,10 +1,10 @@
-in.shick.lockpatterngenerator
-com.androidemu.nes
-com.showmehills
-org.ntpsync
-com.owncloud
-de.blau.android
-org.mozilla.firefox_beta
-fr.keuse.rightsalert
-paulscode.android.mupen64plus
-de.duenndns.gmdice
+com.brocktice.JustSit
+com.alfray.asqare
+android.tether
+org.projectvoodoo.simplecarrieriqdetector
+com.glTron
+se.sandos.android.delayed
+de.danielweisser.android.ldapsync
+com.uploadedlobster.PwdHash
+eu.domob.anacam
+org.wiktionary
diff --git a/stats/licenses.txt b/stats/licenses.txt
index 3399df2f44..40ec7f5441 100644
--- a/stats/licenses.txt
+++ b/stats/licenses.txt
@@ -1,18 +1,24 @@
-GPLv2+ 14
-GPL 5
-New BSD 1
-LGPL 5
-EPLv1 1
-GPLv3+ 24
-Unknown 4
-GPLv2 43
-GPLv3 103
-EUPL 1
-Apache2 65
-Expat 1
+Public Domain 1
+GPL 6
+GPLv3+ 25
+Unknown 3
+GPLv2 46
+GPLv3 121
+Apache2 68
 EPL 1
-MPL 2
-BSD 6
-AGPLv3 4
-MIT 8
+AGPL 1
+MIT 12
 CCBYSA 1
+WTFPL 1
+Apache 2.0 2
+BSD 7
+GPLv2+ 19
+EUPL 1
+AGPLv3 4
+GPLv3/CCv3.0by 1
+New BSD 2
+LGPL 5
+Public Domain/Unlicense 1
+MPL 2
+Expat 1
+EPLv1 1
diff --git a/stats/repotypes.txt b/stats/repotypes.txt
index 6eb385c72a..a0bb30f9d2 100644
--- a/stats/repotypes.txt
+++ b/stats/repotypes.txt
@@ -1,7 +1,7 @@
-svn 54
+svn 56
 srclib 4
 none 40
-git 126
+git 153
 bzr 8
-git-svn 31
-hg 26
+git-svn 39
+hg 32
diff --git a/stats/total_downloads_app.txt b/stats/total_downloads_app.txt
index 75fbd982b6..70107c9185 100644
--- a/stats/total_downloads_app.txt
+++ b/stats/total_downloads_app.txt
@@ -1,260 +1,275 @@
 # Total downloads by application, since October 2011
-ALL 566681
-An.stop 2357
-aarddict.android 3490
-android.androidVNC 2830
-android.game.prboom 1033
-apps.droidnotify 1253
-arity.calculator 2394
-at.tomtasche.reader 471
-au.com.darkside.XServer 1171
-caldwell.ben.trolly 1709
-cm.aptoide.pt 86
-cmupdaterapp.ui 4119
-com.FireFart.Permissions 2130
-com.addi 2165
-com.agiro.scanner.android 478
-com.alfray.mandelbrot2 1407
-com.alfray.timeriffic 714
-com.andrewshu.android.reddit 1849
-com.android.inputmethod.norwegian 270
-com.android.keepass 3039
-com.androidemu.nes 142
-com.angrydoughnuts.android.alarmclock 3530
-com.anoshenko.android.mahjongg 1344
-com.appengine.paranoid_android.lost 1140
-com.ath0.rpn 457
-com.axelby.podax 1165
-com.beem.project.beem 2884
-com.boardgamegeek 1057
-com.bwx.bequick 2509
-com.bwx.qs.battery 2061
-com.chessclock.android 318
-com.ciarang.tallyphant 423
-com.commonsware.android.arXiv 1083
-com.csipsimple 2039
-com.danga.squeezer 342
-com.digitallizard.nicecompass 1267
-com.dozingcatsoftware.bouncy 3237
+ALL 635214
+An.stop 2599
+aarddict.android 3860
+android.androidVNC 3178
+android.game.prboom 1192
+apps.droidnotify 1392
+arity.calculator 2731
+at.tomtasche.reader 540
+au.com.darkside.XServer 1406
+caldwell.ben.trolly 1847
+cm.aptoide.pt 88
+cmupdaterapp.ui 4538
+com.FireFart.Permissions 2313
+com.addi 2488
+com.agiro.scanner.android 510
+com.alfray.asqare 1
+com.alfray.mandelbrot2 1539
+com.alfray.timeriffic 774
+com.andrewshu.android.reddit 1963
+com.android.inputmethod.norwegian 290
+com.android.keepass 3239
+com.androidemu.nes 462
+com.angrydoughnuts.android.alarmclock 3822
+com.anoshenko.android.mahjongg 1561
+com.appengine.paranoid_android.lost 1264
+com.ath0.rpn 528
+com.axelby.podax 1284
+com.beem.project.beem 3127
+com.boardgamegeek 1140
+com.bwx.bequick 2781
+com.bwx.qs.battery 2260
+com.chessclock.android 356
+com.ciarang.tallyphant 463
+com.commonsware.android.arXiv 1158
+com.csipsimple 2270
+com.danga.squeezer 370
+com.digitallizard.nicecompass 1464
+com.dozingcatsoftware.bouncy 3592
 com.drodin.tuxrider 26
-com.eddyspace.networkmonitor 1131
-com.eleybourn.bookcatalogue 1647
-com.episode6.android.appalarm.pro 162
-com.evancharlton.mileage 1191
-com.everysoft.autoanswer 453
-com.example.android.maxpapers 2067
-com.fsck.k9 8787
-com.funambol.androidsync 1365
-com.ghostsq.commander 6442
-com.google.android.diskusage 4308
+com.eddyspace.networkmonitor 1251
+com.eleybourn.bookcatalogue 1758
+com.episode6.android.appalarm.pro 166
+com.evancharlton.mileage 1289
+com.everysoft.autoanswer 525
+com.example.android.maxpapers 2271
+com.fsck.k9 10514
+com.funambol.androidsync 1469
+com.ghostsq.commander 7042
+com.glTron 1
+com.google.android.diskusage 4676
 com.google.android.maps.mytracks 554
-com.google.android.stardroid 277
-com.google.code.appsorganizer 2338
-com.google.zxing.client.android 8895
+com.google.android.stardroid 323
+com.google.code.appsorganizer 2531
+com.google.zxing.client.android 9785
 com.googlecode.androidcells 430
-com.googlecode.chartdroid 462
-com.googlecode.droidwall 4100
-com.googlecode.talkmyphone 667
-com.gpl.rpg.AndorsTrail 4510
-com.hermit.btreprap 101
-com.hughes.android.dictionary 2018
-com.ichi2.anki 2740
-com.ihunda.android.binauralbeat 2054
-com.jadn.cc 1365
-com.kirit.android.mintercept 2223
-com.kmagic.solitaire 3430
-com.kostmo.wallpaper.spiral 481
-com.lecz.android.tiltmazes 2268
-com.leinardi.kitchentimer 1590
-com.liato.bankdroid 482
-com.matburt.mobileorg 1640
-com.mobilepearls.sokoban 2306
-com.morphoss.acal 6375
-com.mp3tunes.android.player 112
-com.namelessdev.mpdroid 816
-com.nexes.manager 2952
-com.owncloud 574
-com.proch.practicehub 1391
-com.replica.replicaisland 2643
-com.ringdroid 1654
-com.roozen.SoundManager 1453
-com.scottmain.android.searchlight 1225
-com.seavenois.tetris 1379
-com.serone.desktoplabel 954
-com.showmehills 94
-com.smorgasbork.hotdeath 1407
-com.stericson.permissions 2437
-com.tastycactus.timesheet 674
-com.teleca.jamendo 2375
-com.textuality.lifesaver2 966
-com.totsp.bookworm 921
-com.totsp.crossword.shortyz 416
-com.unitedcoders.android.gpodroid 651
-com.voidcode.diasporawebclient 1781
-com.volosyukivan 1551
-com.wanghaus.remembeer 190
-com.webworxshop.swallowcatcher 1122
-com.zapta.apps.maniana 1003
+com.googlecode.chartdroid 496
+com.googlecode.droidwall 4630
+com.googlecode.talkmyphone 713
+com.gpl.rpg.AndorsTrail 4977
+com.hermit.btreprap 141
+com.hughes.android.dictionary 2251
+com.ichi2.anki 3006
+com.ihunda.android.binauralbeat 2329
+com.jadn.cc 1489
+com.kirit.android.mintercept 2452
+com.kmagic.solitaire 3835
+com.kostmo.wallpaper.spiral 576
+com.lecz.android.tiltmazes 2480
+com.leinardi.kitchentimer 1799
+com.liato.bankdroid 534
+com.matburt.mobileorg 1800
+com.mobilepearls.sokoban 2552
+com.morphoss.acal 7405
+com.mp3tunes.android.player 121
+com.namelessdev.mpdroid 974
+com.nexes.manager 3244
+com.owncloud 892
+com.proch.practicehub 1519
+com.replica.replicaisland 2926
+com.ringdroid 1825
+com.roozen.SoundManager 1588
+com.scottmain.android.searchlight 1434
+com.seavenois.tetris 1717
+com.serone.desktoplabel 1031
+com.showmehills 169
+com.smorgasbork.hotdeath 1538
+com.stericson.permissions 2776
+com.tastycactus.timesheet 776
+com.teleca.jamendo 2594
+com.textuality.lifesaver2 1083
+com.totsp.bookworm 1007
+com.totsp.crossword.shortyz 475
+com.unitedcoders.android.gpodroid 730
+com.uploadedlobster.PwdHash 22
+com.voidcode.diasporawebclient 1932
+com.volosyukivan 1707
+com.wanghaus.remembeer 200
+com.webworxshop.swallowcatcher 1188
+com.zapta.apps.maniana 1210
 com.zegoggles.smssync 704
-cri.sanity 937
-cx.hell.android.pdfview 2889
-cz.hejl.chesswalk 2259
-cz.romario.opensudoku 1985
-de.blau.android 230
-de.delusions.measure 557
-de.duenndns.gmdice 524
-de.fmaul.android.cmis 155
+cri.sanity 1112
+cx.hell.android.pdfview 3492
+cz.hejl.chesswalk 2565
+cz.romario.opensudoku 2243
+de.blau.android 320
+de.delusions.measure 673
+de.duenndns.gmdice 670
+de.fmaul.android.cmis 181
 de.joergjahnke.c64.android 32
-de.schildbach.wallet 410
-de.schildbach.wallet_test 91
-de.shandschuh.slightbackup 1481
-de.shandschuh.sparserss 4040
-de.ub0r.android.adBlock 3697
-dk.andsen.asqlitemanager 1704
-edu.killerud.kitchentimer 518
-edu.nyu.cs.omnidroid.app 1310
-edu.rit.poe.atomix 1836
-es.cesar.quitesleep 412
-es.prodevelop.gvsig.mini 1449
-fm.libre.droid 1157
-fr.keuse.rightsalert 366
-fr.seeks 475
-goo.TeaTimer 1227
-in.shick.lockpatterngenerator 53
-info.guardianproject.browser 1534
-info.guardianproject.cacert 927
-info.guardianproject.otr.app.im 1757
-info.lamatricexiste.network 5356
-info.staticfree.android.twentyfourhour 1181
-info.staticfree.android.units 3319
-jackpal.androidterm 1515
-kdk.android.simplydo 761
-li.klass.fhem 301
-me.guillaumin.android.osmtracker 2022
-mixedbit.speechtrainer 976
-name.bagi.levente.pedometer 1963
-net.androgames.level 2888
-net.avs234 1899
-net.bytten.xkcdviewer 1844
-net.cactii.mathdoku 1159
-net.dahanne.android.regalandroid 482
-net.fercanet.LNM 2048
-net.gaast.giggity 478
-net.healeys.lexic 367
-net.iowaline.dotdash 612
-net.jaqpot.netcounter 1997
-net.mafro.android.wakeonlan 1345
-net.micode.compass 2706
-net.nightwhistler.pageturner 751
-net.osmand 2299
-net.osmand.plus 7345
-net.pierrox.mcompass 1830
-net.rocrail.androc 1622
-net.sf.andbatdog.batterydog 2475
-net.sourceforge.servestream 1143
-net.status.client.mobile 709
-net.sylvek.sharemyposition 866
-net.szym.barnacle 1364
-net.tapi.handynotes 3027
-net.tedstein.AndroSS 3477
-net.tevp.postcode 283
-nl.sogeti.android.gpstracker 1218
-nu.firetech.android.pactrack 107
-org.abrantix.rockon.rockonnggl 1300
-org.adaway 11147
-org.adw.launcher 3088
-org.ametro 1377
-org.andnav.osm 2156
-org.androidsoft.games.memory.kids 1512
-org.bc_bd.mrwhite 600
-org.birthdayadapter 709
-org.connectbot 4630
-org.coolreader 6759
-org.curiouscreature.android.shelves 453
-org.damazio.notifier 587
-org.dnaq.dialer2 908
-org.droidseries 1857
-org.eehouse.android.xw4 1895
-org.example.pushupbuddy 758
-org.fastergps 2955
-org.fdroid.fdroid 109254
+de.schildbach.wallet 516
+de.schildbach.wallet_test 122
+de.shandschuh.slightbackup 1642
+de.shandschuh.sparserss 4254
+de.ub0r.android.adBlock 4069
+dk.andsen.asqlitemanager 1898
+edu.killerud.kitchentimer 671
+edu.nyu.cs.omnidroid.app 1423
+edu.rit.poe.atomix 1998
+es.cesar.quitesleep 505
+es.prodevelop.gvsig.mini 1576
+eu.domob.anacam 234
+eu.domob.angulo 278
+fm.libre.droid 1259
+fr.keuse.rightsalert 628
+fr.seeks 530
+goo.TeaTimer 1338
+in.shick.diode 232
+in.shick.lockpatterngenerator 183
+info.guardianproject.browser 1748
+info.guardianproject.cacert 984
+info.guardianproject.otr.app.im 1996
+info.lamatricexiste.network 5810
+info.staticfree.android.twentyfourhour 1491
+info.staticfree.android.units 3660
+jackpal.androidterm 1891
+kdk.android.simplydo 933
+li.klass.fhem 355
+me.guillaumin.android.osmtracker 2249
+mixedbit.speechtrainer 1091
+name.bagi.levente.pedometer 2180
+net.androgames.level 3282
+net.avs234 2172
+net.bytten.xkcdviewer 2009
+net.cactii.mathdoku 1271
+net.dahanne.android.regalandroid 518
+net.fercanet.LNM 2217
+net.gaast.giggity 509
+net.healeys.lexic 428
+net.iowaline.dotdash 732
+net.jaqpot.netcounter 2178
+net.mafro.android.wakeonlan 1518
+net.micode.compass 3210
+net.nightwhistler.pageturner 838
+net.osmand 2601
+net.osmand.plus 8257
+net.pierrox.mcompass 2105
+net.rocrail.androc 1750
+net.sf.andbatdog.batterydog 2704
+net.sourceforge.servestream 1237
+net.status.client.mobile 772
+net.sylvek.sharemyposition 965
+net.szym.barnacle 1577
+net.tapi.handynotes 3346
+net.tedstein.AndroSS 3762
+net.tevp.postcode 299
+nl.sogeti.android.gpstracker 1277
+no.rkkc.bysykkel 20
+nu.firetech.android.pactrack 114
+org.abrantix.rockon.rockonnggl 1303
+org.adaway 12306
+org.adw.launcher 3480
+org.ametro 1601
+org.andnav.osm 2425
+org.androidsoft.games.memory.kids 1732
+org.bc_bd.mrwhite 761
+org.beide.bomber 437
+org.birthdayadapter 894
+org.connectbot 5101
+org.coolreader 7174
+org.curiouscreature.android.shelves 498
+org.damazio.notifier 635
+org.dnaq.dialer2 1035
+org.droidseries 1977
+org.eehouse.android.xw4 2044
+org.example.pushupbuddy 830
+org.fastergps 3421
+org.fdroid.fdroid 122748
 org.fdroid.taskstrid 24
-org.fosdem 466
-org.fox.ttrss 372
-org.geometerplus.zlibrary.ui.android 5403
-org.helllabs.android.xmp 656
-org.hermit.audalyzer 2234
-org.hermit.netscramble 1421
-org.hermit.tricorder 3382
-org.jessies.mathdroid 1865
-org.jfedor.frozenbubble 6763
-org.jmoyer.NotificationPlus 424
-org.johanhil.flygtider 124
-org.jsharkey.sky 1208
-org.jtb.alogcat 3106
-org.jtb.droidlife 2196
-org.jtb.httpmon 931
-org.kost.externalip 1952
-org.kreed.vanilla 3300
-org.liberty.android.fantastischmemo 570
-org.linphone 1495
+org.fosdem 486
+org.fox.ttrss 487
+org.geometerplus.zlibrary.ui.android 5798
+org.helllabs.android.xmp 712
+org.hermit.audalyzer 2494
+org.hermit.netscramble 1557
+org.hermit.tricorder 3718
+org.jessies.mathdroid 2057
+org.jfedor.frozenbubble 7389
+org.jmoyer.NotificationPlus 490
+org.johanhil.flygtider 130
+org.jsharkey.sky 1405
+org.jtb.alogcat 3342
+org.jtb.droidlife 2408
+org.jtb.httpmon 1009
+org.kost.externalip 2114
+org.kreed.vanilla 3701
+org.liberty.android.fantastischmemo 676
+org.linphone 1706
+org.madore.android.unicodeMap 165
 org.mailboxer.saymyname 31
-org.marcus905.wifi.ace 2648
-org.mixare 1961
-org.moparisthebest.appbak 2140
-org.mozilla.firefox 18320
-org.mozilla.firefox_beta 1210
-org.mult.daap 913
-org.mustard.android 1873
-org.mythdroid 643
-org.navitproject.navit 1845
-org.nerdcircus.android.klaxon 186
-org.ntpsync 581
-org.openintents.filemanager 2116
+org.marcus905.wifi.ace 2846
+org.mixare 2005
+org.moparisthebest.appbak 2337
+org.mozilla.firefox 20518
+org.mozilla.firefox_beta 1540
+org.mult.daap 1017
+org.mustard.android 1998
+org.mythdroid 704
+org.navitproject.navit 2044
+org.nerdcircus.android.klaxon 211
+org.ntpsync 815
+org.opengpx 75
+org.openintents.filemanager 2494
 org.openintents.newsreader 5
-org.opensatnav 3425
-org.paulmach.textedit 3950
-org.penghuang.tools.rotationlock 1419
-org.piwik.mobile 317
-org.pocketworkstation.pckeyboard 5552
-org.scoutant.blokish 3318
-org.sipdroid.sipua 1364
-org.sixgun.ponyexpress 620
-org.sparkleshare.android 381
-org.swiftp 1338
-org.thialfihar.android.apg 2635
-org.thoughtcrime.securesms 1231
-org.tof 1406
-org.tomdroid 1225
-org.torproject.android 2890
-org.transdroid 1484
-org.ttrssreader 2210
-org.uaraven.e 949
-org.vudroid 3441
-org.wahtod.wififixer 2481
-org.wikipedia 4434
-org.wordpress.android 1538
-org.xbmc.android.remote 1129
-org.xcsoar 295
-org.yaaic 1807
-org.yaxim.androidclient 1978
-org.zirco 5050
-paulscode.android.mupen64plus 680
-pl.magot.vetch.ancal 23
-pt.isec.tp.am 2259
-remuco.client.android 849
-ru.gelin.android.weather.notification 2056
-ru.qrck.quitetaskmanager 1286
-se.johanhil.clipboard 1094
-se.johanhil.duckduckgo 3014
-se.peterbjorkman.android.trafikinfo 171
-seanfoy.wherering 497
+org.opensatnav 3791
+org.paulmach.textedit 4385
+org.penghuang.tools.rotationlock 1579
+org.piwik.mobile 346
+org.pocketworkstation.pckeyboard 6490
+org.projectvoodoo.simplecarrieriqdetector 2
+org.pyload.android.client 44
+org.scoutant.blokish 3671
+org.sipdroid.sipua 1502
+org.sixgun.ponyexpress 654
+org.sparkleshare.android 420
+org.swiftp 1519
+org.thialfihar.android.apg 2918
+org.thoughtcrime.securesms 1417
+org.tof 1620
+org.tomdroid 1318
+org.torproject.android 3208
+org.transdroid 1630
+org.ttrssreader 2296
+org.uaraven.e 1143
+org.vudroid 3781
+org.wahtod.wififixer 2662
+org.wikipedia 5127
+org.wiktionary 109
+org.woltage.irssiconnectbot 125
+org.wordpress.android 1697
+org.xbmc.android.remote 1234
+org.xcsoar 349
+org.yaaic 1956
+org.yaxim.androidclient 2113
+org.zirco 5493
+paulscode.android.mupen64plus 903
+pl.magot.vetch.ancal 24
+pt.isec.tp.am 2643
+remuco.client.android 988
+ru.gelin.android.weather.notification 2317
+ru.qrck.quitetaskmanager 1534
+se.johanhil.clipboard 1221
+se.johanhil.duckduckgo 3363
+se.peterbjorkman.android.trafikinfo 174
+seanfoy.wherering 541
 stericson.busybox.donate 386
-tkj.android.homecontrol.mythmote 566
-to.networld.android.divedroid 423
-tuioDroid.impl 201
-uk.co.jarofgreen.JustADamnCompass 827
-urbanstew.RehearsalAssistant 1091
-us.bravender.android.dongsa 80
-us.lindanrandy.cidrcalculator 1127
-vu.de.urpool.quickdroid 1835
+tkj.android.homecontrol.mythmote 594
+to.networld.android.divedroid 461
+tuioDroid.impl 235
+uk.co.jarofgreen.JustADamnCompass 984
+urbanstew.RehearsalAssistant 1203
+us.bravender.android.dongsa 98
+us.lindanrandy.cidrcalculator 1254
+vu.de.urpool.quickdroid 2037
+wb.receiptspro 197