diff --git a/metadata/com.afollestad.impression.txt b/metadata/com.afollestad.impression.txt
index a8c8556f04..a773f61467 100644
--- a/metadata/com.afollestad.impression.txt
+++ b/metadata/com.afollestad.impression.txt
@@ -17,9 +17,6 @@ don't report issues to upstream that are not present in
 [https://github.com/afollestad/impression/releases official builds].
 .
 
-Repo Type:git
-Repo:https://github.com/afollestad/impression
-
 Build:0.8.0,66
     commit=0.8.0
     subdir=app
@@ -40,6 +37,8 @@ This app has been moved to the archive because people did complain to upstream -
 
 Archive Policy:0 versions
 Auto Update Mode:None
-Update Check Mode:Static
+Update Check Mode:None
 Current Version:0
 Current Version Code:0
+
+No Source Since:0.8.1
diff --git a/metadata/com.google.android.apps.authenticator2.txt b/metadata/com.google.android.apps.authenticator2.txt
index 05fa0d6c48..8cbcb42947 100644
--- a/metadata/com.google.android.apps.authenticator2.txt
+++ b/metadata/com.google.android.apps.authenticator2.txt
@@ -1,6 +1,6 @@
 Categories:Security
 License:Apache-2.0
-Web Site:https://support.google.com/accounts/bin/answer.py?hl=enWeb Site:answer=1066447
+Web Site:https://support.google.com/accounts/bin/answer.py?hl=enWeb%20Site:answer=1066447
 Source Code:https://github.com/google/google-authenticator-android
 Issue Tracker:https://github.com/google/google-authenticator-android/issues
 Changelog:https://github.com/google/google-authenticator-android/blob/HEAD/ChangeLog
diff --git a/metadata/com.gs.mobileprint.txt b/metadata/com.gs.mobileprint.txt
index 0ce3c8eea9..33dd34b69b 100644
--- a/metadata/com.gs.mobileprint.txt
+++ b/metadata/com.gs.mobileprint.txt
@@ -13,9 +13,6 @@ the author wishes to develop servers for the other platforms.
 Status: Beta
 .
 
-Repo Type:git-svn
-Repo:https://svn.code.sf.net/p/mobileprint/code/trunk
-
 Build:0.5,1
     commit=1
 
@@ -23,3 +20,5 @@ Auto Update Mode:None
 Update Check Mode:None
 Current Version:0.5
 Current Version Code:1
+
+No Source Since:0.6
diff --git a/metadata/com.mapswithme.maps.libre.txt b/metadata/com.mapswithme.maps.libre.txt
index 66893a1357..7dc86c74bb 100644
--- a/metadata/com.mapswithme.maps.libre.txt
+++ b/metadata/com.mapswithme.maps.libre.txt
@@ -21,9 +21,6 @@ Features:
 This is an unofficial fork without proprietary dependencies and user tracking.
 .
 
-Repo Type:git
-Repo:https://github.com/relan/omim
-
 Build:5.1.8_r1,51801
     disable=broken on x86 32-bit buildserver VM
     commit=v5.1.8_r1
@@ -44,3 +41,5 @@ Auto Update Mode:None
 Update Check Mode:None
 Current Version:5.1.8_r2
 Current Version Code:51802
+
+No Source Since:5.1.9
diff --git a/metadata/com.phg.constellations.txt b/metadata/com.phg.constellations.txt
index c4e77e9e2b..16715f9d14 100644
--- a/metadata/com.phg.constellations.txt
+++ b/metadata/com.phg.constellations.txt
@@ -11,9 +11,6 @@ Star charts and data of the 88 modern constellations, based on data by
 Wikipedia.
 .
 
-Repo Type:git
-Repo:https://github.com/gituser1357/constellations
-
 Build:2.0.2,10004
     commit=v2.0.2
     subdir=app
@@ -28,3 +25,5 @@ Auto Update Mode:None
 Update Check Mode:None
 Current Version:2.0.3
 Current Version Code:10005
+
+No Source Since:2.0.4
diff --git a/metadata/it.andreascarpino.forvodroid.txt b/metadata/it.andreascarpino.forvodroid.txt
index 270a4a317a..24266d14e0 100644
--- a/metadata/it.andreascarpino.forvodroid.txt
+++ b/metadata/it.andreascarpino.forvodroid.txt
@@ -17,9 +17,6 @@ visit [http://api.forvo.com/ Forvo's API page].
 Warning: This app may crash on some HTC and Acer devices.
 .
 
-Repo Type:git
-Repo:https://github.com/ilpianista/forvodroid
-
 Build:1.0,1
     commit=1.0
     srclibs=Google-Gson@gson-2.2.4,CommonsCodec@1_6,ForvoApi@558dfd3f51e03cd4a7e8328702a6d9bba070d5ae
@@ -71,6 +68,8 @@ Upstream removed binaries and source.
 
 Archive Policy:0 versions
 Auto Update Mode:None
-Update Check Mode:Static
+Update Check Mode:None
 Current Version:0
 Current Version Code:0
+
+No Source Since:1.3
diff --git a/metadata/net.vreeken.quickmsg.txt b/metadata/net.vreeken.quickmsg.txt
index 3d7e9724a7..fb20439cb6 100644
--- a/metadata/net.vreeken.quickmsg.txt
+++ b/metadata/net.vreeken.quickmsg.txt
@@ -1,7 +1,7 @@
 Categories:Internet,Security
 License:GPL-3.0-only
 Web Site:http://quickmsg.vreeken.net
-Source Code:
+Source Code:http://quickmsg.vreeken.net/QuickMSG.git
 Issue Tracker:
 
 Auto Name:QuickMSG
diff --git a/metadata/org.sixgun.ponyexpress.txt b/metadata/org.sixgun.ponyexpress.txt
index 8cab9e5384..8a0dca14d8 100644
--- a/metadata/org.sixgun.ponyexpress.txt
+++ b/metadata/org.sixgun.ponyexpress.txt
@@ -1,7 +1,7 @@
 Categories:Multimedia
 License:GPL-3.0-only
 Web Site:
-Source Code:
+Source Code:https://gitorious.org/ponyexpress/mainline
 Issue Tracker:
 
 Auto Name:Pony Express
diff --git a/metadata/tk.elevenk.dailybread.txt b/metadata/tk.elevenk.dailybread.txt
index 72b6142af2..78d4ea9385 100644
--- a/metadata/tk.elevenk.dailybread.txt
+++ b/metadata/tk.elevenk.dailybread.txt
@@ -22,9 +22,6 @@ words it is using for the search while it is looking. Search as many times as
 you like to keep finding new, interesting books!
 .
 
-Repo Type:git
-Repo:https://github.com/jpkrause/DailybRead.git
-
 Build:0.2,5
     commit=V0.2
     subdir=app
@@ -41,3 +38,5 @@ Auto Update Mode:None
 Update Check Mode:None
 Current Version:0
 Current Version Code:0
+
+No Source Since:0.3