diff --git a/metadata/edu.cmu.cylab.starslinger.txt b/metadata/edu.cmu.cylab.starslinger.txt
index 5662c182e5..3741b9f5d7 100644
--- a/metadata/edu.cmu.cylab.starslinger.txt
+++ b/metadata/edu.cmu.cylab.starslinger.txt
@@ -1,8 +1,9 @@
 Categories:Internet
 License:MIT
-Web Site:https://github.com/SafeSlingerProject/SafeSlinger-Android/blob/HEAD/README.md
+Web Site:
 Source Code:https://github.com/SafeSlingerProject/SafeSlinger-Android
 Issue Tracker:https://github.com/SafeSlingerProject/SafeSlinger-Android/issues
+Changelog:https://github.com/SafeSlingerProject/SafeSlinger-Android/releases
 
 Auto Name:SafeSlinger
 Summary:Instant messenger
diff --git a/metadata/eu.faircode.finegeotag.txt b/metadata/eu.faircode.finegeotag.txt
index c21b210d56..2318df46cb 100644
--- a/metadata/eu.faircode.finegeotag.txt
+++ b/metadata/eu.faircode.finegeotag.txt
@@ -1,12 +1,14 @@
 Categories:Multimedia
 License:GPL-3.0-or-later
-Web Site:https://github.com/M66B/FineGeotag/blob/HEAD/README.md
+Web Site:
 Source Code:https://github.com/M66B/FineGeotag
 Issue Tracker:https://github.com/M66B/FineGeotag/issues
 
 Auto Name:FineGeotag
 Summary:Automatically geotag photos
 Description:
+'''Note:''' This app is no longer maintained.
+
 Automatically geotag photos with a real-time location right after they are
 taken. The camera application mostly uses the last known location, which could
 be old and miles away from your current position. FineGeotag will try to acquire
diff --git a/metadata/eu.kanade.tachiyomi.txt b/metadata/eu.kanade.tachiyomi.txt
index d16a843565..d00765dcec 100644
--- a/metadata/eu.kanade.tachiyomi.txt
+++ b/metadata/eu.kanade.tachiyomi.txt
@@ -1,8 +1,9 @@
 Categories:Multimedia,Reading
 License:Apache-2.0
-Web Site:https://github.com/inorichi/tachiyomi/blob/HEAD/README.md
+Web Site:https://github.com/inorichi/tachiyomi/wiki
 Source Code:https://github.com/inorichi/tachiyomi
 Issue Tracker:https://github.com/inorichi/tachiyomi/issues
+Changelog:https://github.com/inorichi/tachiyomi/releases
 
 Auto Name:Tachiyomi
 Summary:Manga reader
diff --git a/metadata/eu.veldsoft.four.row.solitaire.txt b/metadata/eu.veldsoft.four.row.solitaire.txt
index 9b5d33bebd..9c8cd09fb5 100644
--- a/metadata/eu.veldsoft.four.row.solitaire.txt
+++ b/metadata/eu.veldsoft.four.row.solitaire.txt
@@ -1,7 +1,7 @@
 Disabled:changed app id
 Categories:Games
 License:GPL-3.0-or-later
-Web Site:https://github.com/VelbazhdSoftwareLLC/FreeKlondike/blob/HEAD/README.md
+Web Site:
 Source Code:https://github.com/VelbazhdSoftwareLLC/FreeKlondike
 Issue Tracker:https://github.com/VelbazhdSoftwareLLC/FreeKlondike/issues
 
diff --git a/metadata/felixwiemuth.lincal.txt b/metadata/felixwiemuth.lincal.txt
index 790cfec866..5643729c0a 100644
--- a/metadata/felixwiemuth.lincal.txt
+++ b/metadata/felixwiemuth.lincal.txt
@@ -1,6 +1,6 @@
 Categories:Multimedia
 License:GPL-3.0-only
-Web Site:https://github.com/felixwiemuth/LinCal/blob/HEAD/README.md
+Web Site:
 Source Code:https://github.com/felixwiemuth/LinCal
 Issue Tracker:https://github.com/felixwiemuth/LinCal/issues
 
diff --git a/metadata/fly.speedmeter.grub.txt b/metadata/fly.speedmeter.grub.txt
index 22840a308f..5f9fdfee38 100644
--- a/metadata/fly.speedmeter.grub.txt
+++ b/metadata/fly.speedmeter.grub.txt
@@ -1,6 +1,6 @@
 Categories:Navigation
 License:GPL-2.0-only
-Web Site:https://github.com/flyingrub/SpeedMeter/blob/HEAD/README.md
+Web Site:
 Source Code:https://github.com/flyingrub/SpeedMeter
 Issue Tracker:https://github.com/flyingrub/SpeedMeter/issues
 Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=SP3QEMAM8XZYQ
diff --git a/metadata/fm.a2d.sf.txt b/metadata/fm.a2d.sf.txt
index 090780ee33..18332d1c27 100644
--- a/metadata/fm.a2d.sf.txt
+++ b/metadata/fm.a2d.sf.txt
@@ -1,6 +1,6 @@
 Categories:Multimedia
 License:AGPL-3.0-or-later
-Web Site:https://github.com/mikereidis/spirit2_free/blob/HEAD/README_OPENSOURCE_BUILDING.txt
+Web Site:
 Source Code:https://github.com/mikereidis/spirit2_free
 Issue Tracker:https://github.com/mikereidis/spirit2_free/issues
 Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=mikereidis%40gmail%2ecom&lc=CA&item_name=Spirit%20FM%20%2d%20Mike%20Reid&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted
diff --git a/metadata/fr.herverenault.selfhostedgpstracker.txt b/metadata/fr.herverenault.selfhostedgpstracker.txt
index 31d3dc0a1d..79c6baf3ee 100644
--- a/metadata/fr.herverenault.selfhostedgpstracker.txt
+++ b/metadata/fr.herverenault.selfhostedgpstracker.txt
@@ -1,8 +1,8 @@
 Categories:Navigation
 License:GPL-3.0-only
-Web Site:https://github.com/herverenault/Self-Hosted-GPS-Tracker/blob/HEAD/README.md
+Web Site:
 Source Code:https://github.com/herverenault/Self-Hosted-GPS-Tracker
-Issue Tracker:https://github.com/herverenault/Self-Hosted-GPS-Tracker/issues
+Issue Tracker:
 
 Auto Name:Self-Hosted GPS Tracker
 Summary:Track your device
@@ -11,9 +11,6 @@ Sends your GPS coordinates to your server. It's your data, do what you want with
 it. Server part is available in the source repository aswell.
 .
 
-Repo Type:git
-Repo:https://github.com/herverenault/Self-Hosted-GPS-Tracker
-
 Build:1.1.3,6
     commit=v1.1.3.1
     prebuild=mv java src
@@ -61,6 +58,8 @@ repositories.
 
 Archive Policy:0 versions
 Auto Update Mode:None
-Update Check Mode:Static
+Update Check Mode:None
 Current Version:1.8
 Current Version Code:13
+
+No Source Since:1.9
diff --git a/metadata/fr.kwiatkowski.ApkTrack.txt b/metadata/fr.kwiatkowski.ApkTrack.txt
index 567b7a3af1..d971aadb4d 100644
--- a/metadata/fr.kwiatkowski.ApkTrack.txt
+++ b/metadata/fr.kwiatkowski.ApkTrack.txt
@@ -1,8 +1,9 @@
 Categories:System
 License:GPL-3.0-only
-Web Site:https://github.com/JusticeRage/ApkTrack/blob/HEAD/README.md
+Web Site:
 Source Code:https://github.com/JusticeRage/ApkTrack
 Issue Tracker:https://github.com/JusticeRage/ApkTrack/issues
+Changelog:https://github.com/JusticeRage/ApkTrack/releases
 Bitcoin:19wFVDUWhrjRe3rPCsokhcf1w9Stj3Sr6K
 
 Auto Name:ApkTrack
diff --git a/metadata/fr.masciulli.drinks.txt b/metadata/fr.masciulli.drinks.txt
index 59c0372a6b..e5023c253b 100644
--- a/metadata/fr.masciulli.drinks.txt
+++ b/metadata/fr.masciulli.drinks.txt
@@ -1,6 +1,6 @@
 Categories:Reading
 License:Apache-2.0
-Web Site:https://github.com/amasciul/Drinks/blob/HEAD/README.md
+Web Site:
 Source Code:https://github.com/amasciul/Drinks
 Issue Tracker:https://github.com/amasciul/Drinks/issues
 
diff --git a/metadata/fr.s3i.pointeuse.txt b/metadata/fr.s3i.pointeuse.txt
index 683b5bd193..9b1dcefa28 100644
--- a/metadata/fr.s3i.pointeuse.txt
+++ b/metadata/fr.s3i.pointeuse.txt
@@ -1,6 +1,6 @@
 Categories:Time
 License:GPL-3.0-or-later
-Web Site:https://github.com/alandais/Pointeuse_S3I/blob/HEAD/README.md
+Web Site:
 Source Code:https://github.com/alandais/Pointeuse_S3I
 Issue Tracker:https://github.com/alandais/Pointeuse_S3I/issues
 
diff --git a/metadata/fr.tvbarthel.apps.simplethermometer.txt b/metadata/fr.tvbarthel.apps.simplethermometer.txt
index 05f94a8bfe..1707af85d1 100644
--- a/metadata/fr.tvbarthel.apps.simplethermometer.txt
+++ b/metadata/fr.tvbarthel.apps.simplethermometer.txt
@@ -1,9 +1,10 @@
 AntiFeatures:NonFreeDep
 Categories:System
 License:Apache-2.0
-Web Site:https://github.com/tvbarthel/SimpleThermometerProject/blob/HEAD/README.md
+Web Site:
 Source Code:https://github.com/tvbarthel/SimpleThermometerProject
 Issue Tracker:https://github.com/tvbarthel/SimpleThermometerProject/issues
+Changelog:https://github.com/tvbarthel/SimpleThermometerProject/releases
 
 Auto Name:SimpleThermometer
 Summary:Show current temperature
diff --git a/metadata/fr.tvbarthel.apps.simpleweatherforcast.txt b/metadata/fr.tvbarthel.apps.simpleweatherforcast.txt
index f1ba3a6d02..142a9fe176 100644
--- a/metadata/fr.tvbarthel.apps.simpleweatherforcast.txt
+++ b/metadata/fr.tvbarthel.apps.simpleweatherforcast.txt
@@ -1,9 +1,10 @@
 AntiFeatures:NonFreeDep
 Categories:Time
 License:Apache-2.0
-Web Site:https://github.com/tvbarthel/SimpleWeatherForecast/blob/HEAD/README.md
+Web Site:
 Source Code:https://github.com/tvbarthel/SimpleWeatherForecast
 Issue Tracker:https://github.com/tvbarthel/SimpleWeatherForecast/issues
+Changelog:https://github.com/tvbarthel/SimpleWeatherForecast/releases
 
 Auto Name:SimpleWeatherForecast
 Summary:14 days weather forecast
diff --git a/metadata/fr.tvbarthel.attempt.googlyzooapp.txt b/metadata/fr.tvbarthel.attempt.googlyzooapp.txt
index 347a6dc06e..a71b0e49ab 100644
--- a/metadata/fr.tvbarthel.attempt.googlyzooapp.txt
+++ b/metadata/fr.tvbarthel.attempt.googlyzooapp.txt
@@ -1,9 +1,10 @@
 AntiFeatures:NonFreeDep
 Categories:Games,Multimedia
 License:Apache-2.0
-Web Site:https://github.com/tvbarthel/GooglyZoo/blob/HEAD/README.md
+Web Site:
 Source Code:https://github.com/tvbarthel/GooglyZoo
 Issue Tracker:https://github.com/tvbarthel/GooglyZoo/issues
+Changelog:https://github.com/tvbarthel/GooglyZoo/releases
 
 Auto Name:GooglyZoo
 Summary:Head-tracking virtual pet
diff --git a/metadata/free.rm.netcfgwidget.txt b/metadata/free.rm.netcfgwidget.txt
index fe402276ca..61e333a260 100644
--- a/metadata/free.rm.netcfgwidget.txt
+++ b/metadata/free.rm.netcfgwidget.txt
@@ -1,6 +1,6 @@
 Categories:Internet
 License:GPL-3.0-or-later
-Web Site:https://github.com/ram-on/NetcfgWidget/blob/HEAD/README.md
+Web Site:
 Source Code:https://github.com/ram-on/NetcfgWidget
 Issue Tracker:https://github.com/ram-on/NetcfgWidget/issues
 Changelog:https://github.com/ram-on/NetcfgWidget/releases