diff --git a/metadata/ch.dissem.android.drupal.txt b/metadata/ch.dissem.android.drupal.txt
index 8ca7ec682c..2d101dfe7f 100644
--- a/metadata/ch.dissem.android.drupal.txt
+++ b/metadata/ch.dissem.android.drupal.txt
@@ -1,8 +1,8 @@
 Categories:Internet,Writing
 License:GPLv2
-Web Site:https://code.google.com/p/drupaleditor
-Source Code:https://code.google.com/p/drupaleditor/source
-Issue Tracker:
+Web Site:
+Source Code:https://github.com/Dissem/Drupal-Editor
+Issue Tracker:https://github.com/Dissem/Drupal-Editor/issues
 
 Auto Name:Drupal Editor
 Summary:Publish to Drupal based websites
@@ -11,8 +11,8 @@ Publish and edit pages on websites using Drupal. To make it work with your site
 you have to activate the Blogger API in your settings.
 .
 
-Repo Type:hg
-Repo:https://code.google.com/p/drupaleditor
+Repo Type:git
+Repo:https://github.com/Dissem/Drupal-Editor
 
 Build:1.3.0,17
     commit=4c2d0b27787d
diff --git a/metadata/com.aselalee.trainschedule.txt b/metadata/com.aselalee.trainschedule.txt
index 32e49cd9dc..919bf0bab6 100644
--- a/metadata/com.aselalee.trainschedule.txt
+++ b/metadata/com.aselalee.trainschedule.txt
@@ -1,9 +1,9 @@
 AntiFeatures:UpstreamNonFree
 Categories:Navigation
 License:GPLv3
-Web Site:https://code.google.com/p/sl-train-schedule
-Source Code:https://code.google.com/p/sl-train-schedule/source
-Issue Tracker:
+Web Site:
+Source Code:https://github.com/aselalee/sl-train-schedule
+Issue Tracker:https://github.com/aselalee/sl-train-schedule/issues
 
 Auto Name:Train Schedule
 Summary:Sri Lanka train schedules
@@ -17,8 +17,8 @@ minimum user interactions.
 A non-free analytics library was removed.
 .
 
-Repo Type:git-svn
-Repo:https://sl-train-schedule.googlecode.com/svn;trunk=trunk;tags=tags
+Repo Type:git
+Repo:https://github.com/aselalee/sl-train-schedule
 
 Build:1.15,115
     commit=141
diff --git a/metadata/com.commonsware.android.arXiv.txt b/metadata/com.commonsware.android.arXiv.txt
index 91dd5df29a..d28fd79e13 100644
--- a/metadata/com.commonsware.android.arXiv.txt
+++ b/metadata/com.commonsware.android.arXiv.txt
@@ -1,8 +1,8 @@
 Categories:Reading
 License:GPLv2
-Web Site:https://code.google.com/p/arxiv-mobile
-Source Code:https://code.google.com/p/arxiv-mobile/source
-Issue Tracker:
+Web Site:
+Source Code:https://github.com/jdeslip/arxiv-mobile
+Issue Tracker:https://github.com/jdeslip/arxiv-mobile/issues
 
 Auto Name:arXiv mobile
 Summary:Client for arXiv.org
@@ -15,8 +15,8 @@ articles in your favorite science categories (dozens of physics, math, computer
 science categories) or custom searches.
 .
 
-Repo Type:git-svn
-Repo:https://arxiv-mobile.googlecode.com/svn/trunk
+Repo Type:git
+Repo:https://github.com/jdeslip/arxiv-mobile
 
 Build:2.0.4,90
     disable=94 but doesn't compile due to apparently missing resource
diff --git a/metadata/com.csipsimple.txt b/metadata/com.csipsimple.txt
index 48f248d324..bff274eb7c 100644
--- a/metadata/com.csipsimple.txt
+++ b/metadata/com.csipsimple.txt
@@ -66,6 +66,13 @@ Does not break the app on other devices nor on HTC Evo devices that don't have
 the jar shipped with the device from HTC.
 
 To get the srclib revisions, run 'git svn show-externals'. One is nested inside pjsip.
+
+As google code has shut down, the most likely new upstream location is now
+at https://github.com/r3gis3r/CSipSimple.
+
+See https://github.com/r3gis3r/CSipSimple/issues/6 for more discussion about
+this issue, as of June 23 2016, the maintainers haven't responded to that
+question yet.
 .
 
 Auto Update Mode:None
diff --git a/metadata/com.darshancomputing.BatteryIndicator.txt b/metadata/com.darshancomputing.BatteryIndicator.txt
index 50f955f59e..781fa4cd49 100644
--- a/metadata/com.darshancomputing.BatteryIndicator.txt
+++ b/metadata/com.darshancomputing.BatteryIndicator.txt
@@ -2,8 +2,8 @@ Categories:System
 License:GPLv3
 Web Site:http://www.batterybot.info/
 Source Code:https://github.com/darshan-/Battery-Indicator-Free
-Issue Tracker:
-Donate:https://code.google.com/p/battery-indicator/wiki/PackageDownload?tm=2
+Issue Tracker:https://github.com/darshan-/Battery-Indicator-Free/issues
+Donate:https://github.com/darshan-/Battery-Indicator-Support/blob/HEAD/PackageDownload.md#support--donate
 
 Auto Name:BatteryBot
 Summary:Battery monitoring tool
diff --git a/metadata/com.darshancomputing.BatteryIndicatorPro.txt b/metadata/com.darshancomputing.BatteryIndicatorPro.txt
index 0c33533056..efbf787265 100644
--- a/metadata/com.darshancomputing.BatteryIndicatorPro.txt
+++ b/metadata/com.darshancomputing.BatteryIndicatorPro.txt
@@ -2,8 +2,8 @@ Categories:System
 License:GPLv3
 Web Site:http://www.batterybot.info/
 Source Code:https://github.com/darshan-/Battery-Indicator-Pro
-Issue Tracker:
-Donate:https://code.google.com/p/battery-indicator/wiki/PackageDownload?tm=2
+Issue Tracker:https://github.com/darshan-/Battery-Indicator-Pro/issues
+Donate:https://github.com/darshan-/Battery-Indicator-Support/blob/HEAD/PackageDownload.md#support--donate
 
 Auto Name:BatteryBot
 Summary:Battery monitoring tool
diff --git a/metadata/com.dngames.mobilewebcam.txt b/metadata/com.dngames.mobilewebcam.txt
index 1fdbd43741..bf02783c5e 100644
--- a/metadata/com.dngames.mobilewebcam.txt
+++ b/metadata/com.dngames.mobilewebcam.txt
@@ -1,9 +1,9 @@
 AntiFeatures:UpstreamNonFree
 Categories:Multimedia
 License:Apache2
-Web Site:https://code.google.com/p/mobilewebcam-android
-Source Code:https://code.google.com/p/mobilewebcam-android/source
-Issue Tracker:
+Web Site:
+Source Code:https://github.com/dngames/mobilewebcam-android
+Issue Tracker:https://github.com/dngames/mobilewebcam-android/issues
 Donate:http://forum.xda-developers.com/donatetome.php?u=2554465
 
 Auto Name:MobileWebCam
@@ -24,8 +24,8 @@ app after a certain number of pictures.
 The proprietary Google AdMobSDK was replaced with a dummy library.
 .
 
-Repo Type:git-svn
-Repo:https://mobilewebcam-android.googlecode.com/svn
+Repo Type:git
+Repo:https://github.com/dngames/mobilewebcam-android
 
 Build:2.59,87
     commit=7
diff --git a/metadata/com.google.android.diskusage.txt b/metadata/com.google.android.diskusage.txt
index 4596e8efc3..5f5acbdeb8 100644
--- a/metadata/com.google.android.diskusage.txt
+++ b/metadata/com.google.android.diskusage.txt
@@ -69,7 +69,7 @@ Build:3.4.3,3043
 
 Maintainer Notes:
 The system.jar is from AOSP - see extra/system.jar.README and
-[https://code.google.com/p/diskusage/issues/detail?id=19]
+[https://github.com/ivanvolosyuk/diskusage/issues/19]
 
 The build system complains that native code should have been built but none
 was packaged. This is partially correct - it's 'packaged' in the assets
diff --git a/metadata/com.googlecode.chartdroid.txt b/metadata/com.googlecode.chartdroid.txt
index c397d67fb0..c5a28af115 100644
--- a/metadata/com.googlecode.chartdroid.txt
+++ b/metadata/com.googlecode.chartdroid.txt
@@ -1,8 +1,8 @@
 Categories:Multimedia
 License:Apache2
-Web Site:https://code.google.com/p/chartdroid
-Source Code:https://code.google.com/p/chartdroid/source
-Issue Tracker:
+Web Site:
+Source Code:https://github.com/kostmo/chartdroid
+Issue Tracker:https://github.com/kostmo/chartdroid/issues
 
 Auto Name:ChartDroid Core
 Summary:Chart engine
@@ -13,8 +13,8 @@ Android. Other applications can use it to graph/plot/display numerical data in
 many representations by implementing a ContentProvider.
 .
 
-Repo Type:git-svn
-Repo:https://chartdroid.googlecode.com/svn/trunk/core
+Repo Type:git
+Repo:https://github.com/kostmo/chartdroid
 
 Build:2.0.0,18
     commit=294
diff --git a/metadata/com.gpl.rpg.AndorsTrail.txt b/metadata/com.gpl.rpg.AndorsTrail.txt
index 9fa1f114bb..1b114b607a 100644
--- a/metadata/com.gpl.rpg.AndorsTrail.txt
+++ b/metadata/com.gpl.rpg.AndorsTrail.txt
@@ -1,8 +1,8 @@
 Categories:Games
 License:GPLv2
 Web Site:http://andorstrail.com
-Source Code:https://code.google.com/p/andors-trail/source
-Issue Tracker:
+Source Code:https://github.com/Zukero/andors-trail
+Issue Tracker:https://github.com/Zukero/andors-trail/issues
 
 Auto Name:Andor's Trail
 Summary:Quest-driven RPG
@@ -18,11 +18,11 @@ Please note that this is a work in progress, which means that all maps are not
 yet done. This is mainly a version for bug-hunting and compatibility testing.
 Please give feedback on the project page. Many, but not all, of the graphical
 resources are CC-licensed; see the
-[https://code.google.com/p/andors-trail/wiki/License wiki] for details.
+[http://www.andorstrail.com/wiki/doku.php?id=license wiki] for details.
 .
 
 Repo Type:git
-Repo:https://code.google.com/p/andors-trail
+Repo:https://github.com/Zukero/andors-trail
 
 Build:0.6.9,20
     commit=d8b127f9a121
diff --git a/metadata/com.ivanvolosyuk.sharetobrowser.txt b/metadata/com.ivanvolosyuk.sharetobrowser.txt
index c867dddcae..8dcc09cb54 100644
--- a/metadata/com.ivanvolosyuk.sharetobrowser.txt
+++ b/metadata/com.ivanvolosyuk.sharetobrowser.txt
@@ -1,8 +1,8 @@
 Categories:Internet
 License:GPLv2
-Web Site:https://code.google.com/p/share-to-browser
-Source Code:https://code.google.com/p/share-to-browser/source
-Issue Tracker:
+Web Site:
+Source Code:https://github.com/IvanVolosyuk/share-to-browser
+Issue Tracker:https://github.com/IvanVolosyuk/share-to-browser/issues
 
 Auto Name:Send to Computer
 Summary:Send web pages to your computer
@@ -20,7 +20,7 @@ for the server side of things.
 .
 
 Repo Type:git
-Repo:https://code.google.com/p/share-to-browser
+Repo:https://github.com/IvanVolosyuk/share-to-browser
 
 Build:1.5,7
     commit=a884988e72ee
diff --git a/metadata/com.kvance.Nectroid.txt b/metadata/com.kvance.Nectroid.txt
index de39cc663d..adf065f699 100644
--- a/metadata/com.kvance.Nectroid.txt
+++ b/metadata/com.kvance.Nectroid.txt
@@ -1,8 +1,8 @@
 Categories:Multimedia
 License:GPLv3
-Web Site:https://code.google.com/p/nectroid
-Source Code:https://code.google.com/p/nectroid/source
-Issue Tracker:
+Web Site:
+Source Code:https://github.com/cknave/nectroid
+Issue Tracker:https://github.com/cknave/nectroid/issues
 
 Auto Name:Nectroid
 Summary:Demoscene radio
@@ -18,8 +18,8 @@ graphics. Features:
 * Software MP3 player for devices with old/broken versions of Android
 .
 
-Repo Type:git-svn
-Repo:https://nectroid.googlecode.com/svn/trunk
+Repo Type:git
+Repo:https://github.com/cknave/nectroid
 
 Build:1.2.3,10
     commit=61
diff --git a/metadata/com.osmnavigator.txt b/metadata/com.osmnavigator.txt
index d6e88cd016..d92a361708 100644
--- a/metadata/com.osmnavigator.txt
+++ b/metadata/com.osmnavigator.txt
@@ -1,8 +1,8 @@
 Categories:Navigation
 License:GPLv3
-Web Site:https://code.google.com/p/osmbonuspack
-Source Code:https://code.google.com/p/osmbonuspack/source
-Issue Tracker:
+Web Site:
+Source Code:https://github.com/MKergall/osmbonuspack
+Issue Tracker:https://github.com/MKergall/osmbonuspack/issues
 
 Auto Name:OSMNavigator
 Summary:Map/navigation tool for OpenStreetMap
@@ -20,8 +20,8 @@ OpenStreetMap map display. Choose between:
 * View maps offline using MOBAC, MapsForge or cached tiles
 .
 
-Repo Type:git-svn
-Repo:https://osmbonuspack.googlecode.com/svn/trunk/
+Repo Type:git
+Repo:https://github.com/MKergall/osmbonuspack
 
 Build:1.0,1
     disable=wip
diff --git a/metadata/com.ridgelineapps.resdicegame.txt b/metadata/com.ridgelineapps.resdicegame.txt
index bfcf27fd0f..885ec25736 100644
--- a/metadata/com.ridgelineapps.resdicegame.txt
+++ b/metadata/com.ridgelineapps.resdicegame.txt
@@ -1,8 +1,8 @@
 Categories:Games
 License:GPLv3
-Web Site:https://code.google.com/p/android-dice-game
-Source Code:https://code.google.com/p/android-dice-game/source
-Issue Tracker:
+Web Site:
+Source Code:https://github.com/FatMonkeySmile/android-dice-game
+Issue Tracker:https://github.com/FatMonkeySmile/android-dice-game/issues
 
 Auto Name:Catan Dice Game
 Summary:Resource dice game
@@ -11,8 +11,8 @@ Unofficial version of a very famous resource dice board game. This version is
 not associated with the publishers of the original game.
 .
 
-Repo Type:git-svn
-Repo:https://android-dice-game.googlecode.com/svn/trunk
+Repo Type:git
+Repo:https://github.com/FatMonkeySmile/android-dice-game
 
 Build:1.12,13
     commit=125
diff --git a/metadata/com.robert.maps.txt b/metadata/com.robert.maps.txt
index fcead4f8fc..461a4e4cce 100644
--- a/metadata/com.robert.maps.txt
+++ b/metadata/com.robert.maps.txt
@@ -2,8 +2,8 @@ AntiFeatures:UpstreamNonFree
 Categories:Navigation
 License:GPLv3
 Web Site:http://robertdeveloper.blogspot.com/2009/08/rmaps.html
-Source Code:https://code.google.com/p/robertprojects/source
-Issue Tracker:
+Source Code:https://github.com/RobertDeveloper/RMaps.0.9.x
+Issue Tracker:https://github.com/RobertDeveloper/RMaps.0.9.x/issues
 Donate:http://robertdeveloper.blogspot.com
 
 Auto Name:RMaps
@@ -18,8 +18,8 @@ The non-free Google Analytics library has been replaced with the NoAnalytics
 library.
 .
 
-Repo Type:git-svn
-Repo:https://robertprojects.googlecode.com/svn;trunk=trunk;tags=tags
+Repo Type:git
+Repo:https://github.com/RobertDeveloper/RMaps.0.9.x
 
 Build:0.8.11,8104
     commit=463
diff --git a/metadata/com.sputnik.wispr.txt b/metadata/com.sputnik.wispr.txt
index ab8325dcef..b395d94fa8 100644
--- a/metadata/com.sputnik.wispr.txt
+++ b/metadata/com.sputnik.wispr.txt
@@ -1,8 +1,8 @@
 Categories:Internet
 License:GPLv3
-Web Site:https://code.google.com/p/androidwisprclient
-Source Code:https://code.google.com/p/androidwisprclient/source
-Issue Tracker:
+Web Site:
+Source Code:https://github.com/jfisbein/androidwisprclient
+Issue Tracker:https://github.com/jfisbein/androidwisprclient/issues
 
 Auto Name:FON Access
 Summary:Auto connect to FON network
@@ -16,8 +16,8 @@ This app has been abandoned by the author, a maintained fork is available from
 [[com.oakley.fon]].
 .
 
-Repo Type:git-svn
-Repo:https://androidwisprclient.googlecode.com/svn;trunk=trunk;tags=tags
+Repo Type:git
+Repo:https://github.com/jfisbein/androidwisprclient
 
 Build:1.4.7,147
     commit=134
diff --git a/metadata/com.tmarki.comicmaker.txt b/metadata/com.tmarki.comicmaker.txt
index d1347bf09c..50845de0fe 100644
--- a/metadata/com.tmarki.comicmaker.txt
+++ b/metadata/com.tmarki.comicmaker.txt
@@ -2,13 +2,14 @@ AntiFeatures:UpstreamNonFree
 Categories:Graphics
 License:GPLv3
 Web Site:http://www.tmarki.com/apps
-Source Code:https://code.google.com/p/android-rage-maker/source
-Issue Tracker:
+Source Code:https://github.com/tmarki/android-rage-maker
+Issue Tracker:https://github.com/tmarki/android-rage-maker/issues
 
 Auto Name:Rage Maker
 Summary:Comic strip maker
 Description:
-See the [https://code.google.com/p/android-rage-maker/wiki README] about usage.
+See the [https://github.com/tmarki/android-rage-maker/blob/wiki/readme.md
+README] about usage.
 
 * Flexible number of panels (1-20)
 * Pan and zoom the comic canvas, as well as image elements
@@ -22,7 +23,7 @@ See the [https://code.google.com/p/android-rage-maker/wiki README] about usage.
 .
 
 Repo Type:git
-Repo:https://code.google.com/p/android-rage-maker
+Repo:https://github.com/tmarki/android-rage-maker
 
 Build:1.5.4,33
     commit=320cd3606747
diff --git a/metadata/com.tortuca.holoken.txt b/metadata/com.tortuca.holoken.txt
index 4f4d339844..2d5196160b 100644
--- a/metadata/com.tortuca.holoken.txt
+++ b/metadata/com.tortuca.holoken.txt
@@ -1,8 +1,8 @@
 Categories:Games
 License:GPLv3
-Web Site:https://code.google.com/p/holoken
-Source Code:https://code.google.com/p/holoken/source
-Issue Tracker:
+Web Site:
+Source Code:https://github.com/tortuca/holoken-alpha
+Issue Tracker:https://github.com/tortuca/holoken-alpha/issues
 
 Auto Name:HoloKen
 Summary:KenKen game
@@ -15,8 +15,8 @@ arithmetic and challenge your mind. The goal is to fill in the entire grid with
 numbers while meeting the operation restrictions for each grid cage.
 .
 
-Repo Type:git-svn
-Repo:https://holoken.googlecode.com/svn/trunk
+Repo Type:git
+Repo:https://github.com/tortuca/holoken-alpha
 
 Build:1.1.1,11
     commit=4
diff --git a/metadata/cx.hell.android.pdfviewpro.txt b/metadata/cx.hell.android.pdfviewpro.txt
index e6b97f3239..8fee1e611b 100644
--- a/metadata/cx.hell.android.pdfviewpro.txt
+++ b/metadata/cx.hell.android.pdfviewpro.txt
@@ -1,8 +1,8 @@
 Categories:Reading
 License:GPLv3
-Web Site:https://code.google.com/p/apv
-Source Code:https://code.google.com/p/apv/source
-Issue Tracker:
+Web Site:
+Source Code:https://github.com/mpietrzak/apv
+Issue Tracker:https://github.com/mpietrzak/apv/issues
 Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=LKB59NTKW9QLS
 Bitcoin:1MLdh6uAPymWVJ4bmRde684uTcLJWwumkK
 
@@ -26,8 +26,8 @@ architectures: if you are in doubt, you should try the arm one. The client will
 mark the arm version as current so take care updating if you use the x86 one.
 .
 
-Repo Type:hg
-Repo:https://code.google.com/p/apv
+Repo Type:git
+Repo:https://github.com/mpietrzak/apv
 
 Build:0.3.4-arm,34000
     disable=jni probs 4f6cb715dbef
diff --git a/metadata/de.antonwolf.agendawidget.txt b/metadata/de.antonwolf.agendawidget.txt
index c460c063d2..cbd356b4a8 100644
--- a/metadata/de.antonwolf.agendawidget.txt
+++ b/metadata/de.antonwolf.agendawidget.txt
@@ -1,8 +1,8 @@
 Categories:Time
 License:MIT
-Web Site:https://code.google.com/p/antons-apps
-Source Code:https://code.google.com/p/antons-apps/source
-Issue Tracker:
+Web Site:
+Source Code:https://github.com/antonwolf/antons-apps
+Issue Tracker:https://github.com/antonwolf/antons-apps/issues
 
 Name:Anton Widget
 Auto Name:Anton's Calendar Widget
@@ -13,8 +13,8 @@ location and calendar colour. Birthday events from Outlook and Facebook can be
 displayed separately.
 .
 
-Repo Type:git-svn
-Repo:https://antons-apps.googlecode.com/svn/trunk
+Repo Type:git
+Repo:https://github.com/antonwolf/antons-apps
 
 Build:1.7.0,22
     commit=110
diff --git a/metadata/de.stefan_oltmann.kaesekaestchen.txt b/metadata/de.stefan_oltmann.kaesekaestchen.txt
index cf459270c0..cd5ae0feba 100644
--- a/metadata/de.stefan_oltmann.kaesekaestchen.txt
+++ b/metadata/de.stefan_oltmann.kaesekaestchen.txt
@@ -1,8 +1,8 @@
 Categories:Games
 License:GPLv3
-Web Site:https://code.google.com/p/kaesekaestchen
-Source Code:https://code.google.com/p/kaesekaestchen/source
-Issue Tracker:
+Web Site:
+Source Code:https://github.com/StefanOltmann/Kaesekaestchen
+Issue Tracker:https://github.com/StefanOltmann/Kaesekaestchen/issues
 
 Name:Dots'n'Boxes
 Auto Name:Käsekästchen
@@ -15,8 +15,8 @@ player who has colored more boxes wins. You are playing against the computer.
 The computer is red; you are blue.
 .
 
-Repo Type:git-svn
-Repo:https://kaesekaestchen.googlecode.com/svn/trunk/Kaesekaestchen
+Repo Type:git
+Repo:https://github.com/StefanOltmann/Kaesekaestchen
 
 Build:0.5,7
     commit=9
diff --git a/metadata/de.zieren.rot13.txt b/metadata/de.zieren.rot13.txt
index 5363c93b69..e35a747465 100644
--- a/metadata/de.zieren.rot13.txt
+++ b/metadata/de.zieren.rot13.txt
@@ -1,8 +1,8 @@
 Categories:Development
 License:GPLv3
-Web Site:https://code.google.com/p/rot13translator
-Source Code:https://code.google.com/p/rot13translator/source
-Issue Tracker:
+Web Site:
+Source Code:https://github.com/zieren/rot13translator
+Issue Tracker:https://github.com/zieren/rot13translator/issues
 
 Auto Name:ROT13 Translator
 Summary:Encode/decode ROT13 text
@@ -12,8 +12,8 @@ of hiding text from a casual glance, comparable to a magazine printing the
 solution to a quiz upside down.
 .
 
-Repo Type:git-svn
-Repo:https://rot13translator.googlecode.com/svn;trunk=trunk/android;tags=tags/android
+Repo Type:git
+Repo:https://github.com/zieren/rot13translator
 
 Build:1.0.2,3
     commit=1.0.2
diff --git a/metadata/eu.flatworld.android.slider.txt b/metadata/eu.flatworld.android.slider.txt
index 0a5253b9ae..ec522b9bea 100644
--- a/metadata/eu.flatworld.android.slider.txt
+++ b/metadata/eu.flatworld.android.slider.txt
@@ -1,9 +1,9 @@
 AntiFeatures:UpstreamNonFree
 Categories:Multimedia
 License:Apache2
-Web Site:http://www.flatworld.eu/slider
-Source Code:https://code.google.com/p/android-slider/source
-Issue Tracker:
+Web Site:http://www.flatworld.eu
+Source Code:https://github.com/marcopar/SliderSynth
+Issue Tracker:https://github.com/marcopar/SliderSynth/issues
 
 Summary:Basic musical instrument
 Description:
@@ -18,8 +18,8 @@ If you experience stuttering, reduce the sample rate in the settings. Google
 Analytics was removed before building.
 .
 
-Repo Type:git-svn
-Repo:https://android-slider.googlecode.com/svn;trunk=trunk;tags=tags
+Repo Type:git
+Repo:https://github.com/marcopar/SliderSynth
 
 Build:1.0.2,3
     commit=10
diff --git a/metadata/it.ecosw.dudo.txt b/metadata/it.ecosw.dudo.txt
index 52fe85ffdf..a55563045a 100644
--- a/metadata/it.ecosw.dudo.txt
+++ b/metadata/it.ecosw.dudo.txt
@@ -1,8 +1,8 @@
 Categories:Games
 License:GPLv3+
-Web Site:https://code.google.com/p/dudo
-Source Code:https://code.google.com/p/dudo/source
-Issue Tracker:
+Web Site:
+Source Code:https://github.com/Eco80/dudo
+Issue Tracker:https://github.com/Eco80/dudo/issues
 
 Auto Name:Dudo
 Summary:Dudo game
@@ -19,7 +19,7 @@ retain a die (or dice) is the winner.
 .
 
 Repo Type:git
-Repo:https://code.google.com/p/dudo
+Repo:https://github.com/Eco80/dudo
 
 Build:0.4.2,9
     commit=190e74de598698
diff --git a/metadata/net.exclaimindustries.geohashdroid.txt b/metadata/net.exclaimindustries.geohashdroid.txt
index 7000cc30a8..7c28563c36 100644
--- a/metadata/net.exclaimindustries.geohashdroid.txt
+++ b/metadata/net.exclaimindustries.geohashdroid.txt
@@ -2,9 +2,9 @@ Disabled:Non-free dependency
 AntiFeatures:UpstreamNonFree
 Categories:Navigation
 License:NewBSD
-Web Site:https://code.google.com/p/geohashdroid
-Source Code:https://code.google.com/p/geohashdroid/source
-Issue Tracker:
+Web Site:
+Source Code:https://github.com/CaptainSpam/geohashdroid
+Issue Tracker:https://github.com/CaptainSpam/geohashdroid/issues
 
 Auto Name:Geohash Droid
 Summary:Geohashing app
@@ -14,7 +14,7 @@ and follow you as you travel towards it.
 .
 
 Repo Type:git
-Repo:https://code.google.com/p/geohashdroid
+Repo:https://github.com/CaptainSpam/geohashdroid
 
 Auto Update Mode:None
 Update Check Mode:Static
diff --git a/metadata/net.kervala.comicsreader.txt b/metadata/net.kervala.comicsreader.txt
index 4bef9329a1..85ffb3c17a 100644
--- a/metadata/net.kervala.comicsreader.txt
+++ b/metadata/net.kervala.comicsreader.txt
@@ -1,8 +1,8 @@
 Categories:Reading
 License:GPLv3
-Web Site:https://code.google.com/p/android-comicsreader
-Source Code:https://code.google.com/p/android-comicsreader/source
-Issue Tracker:
+Web Site:http://dev.kervala.net/projects/comicsreader/wiki
+Source Code:http://dev.kervala.net/projects/comicsreader/repository
+Issue Tracker:http://dev.kervala.net/projects/comicsreader/issues
 
 Auto Name:Comics Reader
 Summary:Comic and image viewer
@@ -21,7 +21,7 @@ Description:
 .
 
 Repo Type:hg
-Repo:https://code.google.com/p/android-comicsreader
+Repo:http://hg.kervala.net/comicsreader/
 
 Build:1.0,2
     disable=7ecb0e
diff --git a/metadata/net.nurik.roman.dashclock.txt b/metadata/net.nurik.roman.dashclock.txt
index ee131548dc..ba9e91c553 100644
--- a/metadata/net.nurik.roman.dashclock.txt
+++ b/metadata/net.nurik.roman.dashclock.txt
@@ -1,9 +1,9 @@
 Categories:Theming
 License:Apache2
-Web Site:https://code.google.com/p/dashclock
-Source Code:https://code.google.com/p/dashclock/source
-Issue Tracker:
-Changelog:https://code.google.com/p/dashclock/wiki/Changelog
+Web Site:
+Source Code:https://github.com/romannurik/dashclock/
+Issue Tracker:https://github.com/romannurik/dashclock/issues
+Changelog:https://github.com/romannurik/dashclock/wiki/Changelog
 
 Auto Name:DashClock Widget
 Summary:Extensible lock screen widget
diff --git a/metadata/net.rocboronat.android.wallpaper.npe.txt b/metadata/net.rocboronat.android.wallpaper.npe.txt
index 2d203ca116..70b5ec3420 100644
--- a/metadata/net.rocboronat.android.wallpaper.npe.txt
+++ b/metadata/net.rocboronat.android.wallpaper.npe.txt
@@ -1,8 +1,8 @@
 Categories:Theming,Multimedia
 License:GPLv3
-Web Site:https://code.google.com/p/black-npe-live-wallpaper
-Source Code:https://code.google.com/p/black-npe-live-wallpaper/source/browse
-Issue Tracker:
+Web Site:
+Source Code:https://github.com/rocboronat/NullBlackWallpaper
+Issue Tracker:https://github.com/rocboronat/NullBlackWallpaper/issues
 
 Auto Name:Null Black Wallpaper
 Summary:Live wallpaper that does nothing
@@ -10,8 +10,8 @@ Description:
 Use a blank pattern as "live wallpaper".
 .
 
-Repo Type:hg
-Repo:https://code.google.com/p/black-npe-live-wallpaper/
+Repo Type:git
+Repo:https://github.com/rocboronat/NullBlackWallpaper
 
 Build:3.14,3
     commit=fa06e030ad36
diff --git a/metadata/net.sylvek.sharemyposition.txt b/metadata/net.sylvek.sharemyposition.txt
index 974cd2f624..807ef80a07 100644
--- a/metadata/net.sylvek.sharemyposition.txt
+++ b/metadata/net.sylvek.sharemyposition.txt
@@ -1,9 +1,9 @@
 AntiFeatures:UpstreamNonFree
 Categories:Navigation
 License:GPLv3
-Web Site:https://code.google.com/p/sharemyposition
-Source Code:https://code.google.com/p/sharemyposition/source
-Issue Tracker:
+Web Site:
+Source Code:https://github.com/sylvek/sharemyposition
+Issue Tracker:https://github.com/sylvek/sharemyposition/issues
 
 Auto Name:My position
 Summary:Share your location
@@ -20,8 +20,8 @@ Anti-Feature:UpstreamNonFree - Newer versions of this app require Google Play
 Services, so there will not be any further updates in our repos.
 .
 
-Repo Type:git-svn
-Repo:https://sharemyposition.googlecode.com/svn/trunk/ShareMyPosition-android
+Repo Type:git
+Repo:https://github.com/sylvek/sharemyposition
 
 Build:1.0.11,16
     commit=64
diff --git a/metadata/nf.frex.android.txt b/metadata/nf.frex.android.txt
index 989c1f1d2a..7fd31f0661 100644
--- a/metadata/nf.frex.android.txt
+++ b/metadata/nf.frex.android.txt
@@ -1,19 +1,17 @@
 Categories:Science & Education
 License:GPLv3
-Web Site:https://code.google.com/p/frex-app
-Source Code:https://code.google.com/p/frex-app/source
-Issue Tracker:
+Web Site:
+Source Code:https://github.com/forman/frex
+Issue Tracker:https://github.com/forman/frex/issues
 
 Auto Name:Frex
 Summary:Fractal viewer
 Description:
-Generate unusual fractals such as Burning Ship and Odd Onion. The
-[https://code.google.com/p/frex-app/wiki/FrexExamples gallery] has some amazing
-examples which can be opened via the app, since they have the .frex extension.
+Generate unusual fractals such as Burning Ship and Odd Onion.
 .
 
 Repo Type:git
-Repo:https://code.google.com/p/frex-app
+Repo:https://github.com/forman/frex
 
 Build:1.2.2,10
     commit=196d7c
diff --git a/metadata/nl.sogeti.android.gpstracker.txt b/metadata/nl.sogeti.android.gpstracker.txt
index 5afe6d331c..e76258e431 100644
--- a/metadata/nl.sogeti.android.gpstracker.txt
+++ b/metadata/nl.sogeti.android.gpstracker.txt
@@ -1,9 +1,9 @@
 AntiFeatures:NonFreeDep
 Categories:Navigation
 License:GPLv3
-Web Site:https://code.google.com/p/open-gpstracker
-Source Code:https://code.google.com/p/open-gpstracker/source
-Issue Tracker:
+Web Site:
+Source Code:https://github.com/rcgroot/open-gpstracker
+Issue Tracker:https://github.com/rcgroot/open-gpstracker/issues
 
 Auto Name:Open GPS Tracker
 Summary:GPS Logger
@@ -19,7 +19,7 @@ how to build the app from source.
 .
 
 Repo Type:git
-Repo:https://code.google.com/p/open-gpstracker
+Repo:https://github.com/rcgroot/open-gpstracker
 
 Build:1.3.5,85
     disable=missing osm oauth keys
diff --git a/metadata/org.dsandler.apps.markers.txt b/metadata/org.dsandler.apps.markers.txt
index cef21d5332..3a6563d47b 100644
--- a/metadata/org.dsandler.apps.markers.txt
+++ b/metadata/org.dsandler.apps.markers.txt
@@ -1,8 +1,8 @@
 Categories:Graphics
 License:Apache2
-Web Site:https://code.google.com/p/markers-for-android
-Source Code:https://code.google.com/p/markers-for-android/source
-Issue Tracker:
+Web Site:
+Source Code:https://github.com/dsandler/markers
+Issue Tracker:https://github.com/dsandler/markers/issues
 
 Auto Name:Markers
 Summary:Finger drawing
@@ -15,7 +15,7 @@ A tutorial on the website shows how to simulate layers.
 .
 
 Repo Type:git
-Repo:https://code.google.com/p/markers-for-android
+Repo:https://github.com/dsandler/markers
 
 Build:1.0.3,36
     commit=eeabdb
diff --git a/metadata/org.ironrabbit.bhoboard.txt b/metadata/org.ironrabbit.bhoboard.txt
index 37d9a62035..d5345fb141 100644
--- a/metadata/org.ironrabbit.bhoboard.txt
+++ b/metadata/org.ironrabbit.bhoboard.txt
@@ -1,8 +1,8 @@
 Categories:Writing
 License:Apache2
-Web Site:https://code.google.com/p/bho
-Source Code:https://code.google.com/p/bho/source
-Issue Tracker:
+Web Site:
+Source Code:https://github.com/iamironrabbit/bho
+Issue Tracker:https://github.com/iamironrabbit/bho/issues
 
 Auto Name:Tibetan Keyboard
 Summary:Keyboard for Tibetan script
diff --git a/metadata/org.martus.android.txt b/metadata/org.martus.android.txt
index 7869e3fa4c..27c0e204ce 100644
--- a/metadata/org.martus.android.txt
+++ b/metadata/org.martus.android.txt
@@ -1,9 +1,9 @@
 Disabled:Lots of jars
 Categories:System
 License:GPLv3
-Web Site:https://code.google.com/p/martus
-Source Code:https://code.google.com/p/martus/source
-Issue Tracker:
+Web Site:https://martus.org
+Source Code:https://github.com/benetech/Martus-Project
+Issue Tracker:https://github.com/benetech/Martus-Project/issues
 
 Auto Name:Martus
 Summary:
@@ -11,8 +11,8 @@ Description:
 ...
 .
 
-Repo Type:hg
-Repo:https://code.google.com/p/martus.martus-android
+Repo Type:git
+Repo:https://github.com/benetech/Martus-Project
 
 Build:4.4,4
     commit=PlayStoreVersion4
diff --git a/metadata/org.scid.android.txt b/metadata/org.scid.android.txt
index 1bef07b655..764dd42dca 100644
--- a/metadata/org.scid.android.txt
+++ b/metadata/org.scid.android.txt
@@ -1,8 +1,8 @@
 Categories:Games
 License:GPLv2
-Web Site:https://code.google.com/p/scidonthego
-Source Code:https://code.google.com/p/scidonthego/source
-Issue Tracker:
+Web Site:
+Source Code:https://github.com/gkalab/scidonthego
+Issue Tracker:https://github.com/gkalab/scidonthego/issues
 
 Auto Name:Scid on the go
 Summary:View chess games
@@ -10,8 +10,8 @@ Description:
 A browser for Scid chess database files for Android.
 .
 
-Repo Type:git-svn
-Repo:https://scidonthego.googlecode.com/svn/trunk
+Repo Type:git
+Repo:https://github.com/gkalab/scidonthego
 
 Build:1.29,30
     commit=146
diff --git a/metadata/org.sshtunnel.txt b/metadata/org.sshtunnel.txt
index 5f9c7c90d9..b534d4d680 100644
--- a/metadata/org.sshtunnel.txt
+++ b/metadata/org.sshtunnel.txt
@@ -1,8 +1,8 @@
 Categories:Internet
 License:GPLv3
-Web Site:https://code.google.com/p/sshtunnel
-Source Code:https://code.google.com/p/sshtunnel/source
-Issue Tracker:
+Web Site:
+Source Code:https://bitbucket.org/madeye/sshtunnel
+Issue Tracker:https://bitbucket.org/madeye/sshtunnel/issues
 
 Auto Name:SSHTunnel
 Summary:Browse internet via a proxy
@@ -18,7 +18,7 @@ Requires root: No, but the advanced features will require root.
 Requires Root:yes
 
 Repo Type:hg
-Repo:https://code.google.com/p/sshtunnel
+Repo:https://bitbucket.org/madeye/sshtunnel
 
 Build:1.5.5,73
     disable=WIP ceffc98a19b1
diff --git a/metadata/org.transdroid.txt b/metadata/org.transdroid.txt
index 682a88fd6e..ac4d8a26fc 100644
--- a/metadata/org.transdroid.txt
+++ b/metadata/org.transdroid.txt
@@ -2,8 +2,8 @@ AntiFeatures:Tracking
 Categories:Internet
 License:GPLv3
 Web Site:http://www.transdroid.org
-Source Code:https://code.google.com/p/transdroid/source
-Issue Tracker:
+Source Code:https://github.com/erickok/transdroid
+Issue Tracker:https://github.com/erickok/transdroid/issues
 Donate:http://www.transdroid.org
 
 Auto Name:Transdroid Torrent Manager
@@ -22,8 +22,8 @@ address, OS version and Transdroid version.
 For newer versions, see [[org.transdroid.full]] and [[org.transdroid.search]].
 .
 
-Repo Type:hg
-Repo:https://code.google.com/p/transdroid
+Repo Type:git
+Repo:https://github.com/erickok/transdroid
 
 Build:1.1.7,148
     commit=80558abb1047
diff --git a/metadata/paulscode.android.mupen64plusae.txt b/metadata/paulscode.android.mupen64plusae.txt
index 91d0b4c7c5..3a6267a404 100644
--- a/metadata/paulscode.android.mupen64plusae.txt
+++ b/metadata/paulscode.android.mupen64plusae.txt
@@ -9,8 +9,8 @@ Auto Name:Mupen64 Plus AE
 Summary:Nintendo 64 emulator
 Description:
 Mupen64Plus AE (Android Edition) is a port of Mupen64Plus to Android (not
-officially supported by the [https://code.google.com/p/mupen64plus Mupen64Plus]
-team). See [http://pdroms.de/files/nintendo64 PDRoms] for public domain ROMs.
+officially supported by the [http://mupen64plus.org/ Mupen64Plus] team). See
+[http://pdroms.de/files/nintendo64 PDRoms] for public domain ROMs.
 
 For info about specific games:
 [http://mupen64plus.wikia.com/wiki/Mupen64Plus,_Android_Edition_%28AE%29_Wiki
diff --git a/srclibs/Bho.txt b/srclibs/Bho.txt
index 20a3c3e784..6c9419fd51 100644
--- a/srclibs/Bho.txt
+++ b/srclibs/Bho.txt
@@ -1,3 +1,3 @@
 Repo Type:git
-Repo:https://code.google.com/p/bho
+Repo:https://github.com/iamironrabbit/bho