diff --git a/metadata/au.com.darkside.XServer.txt b/metadata/au.com.darkside.XServer.txt
index d0ffc63cf0..c67a45a52e 100644
--- a/metadata/au.com.darkside.XServer.txt
+++ b/metadata/au.com.darkside.XServer.txt
@@ -1,8 +1,8 @@
 Categories:System
 License:MIT
 Web Site:http://my20percent.wordpress.com/2012/02/27/android-x-server
-Source Code:https://code.google.com/p/android-xserver/source
-Issue Tracker:https://code.google.com/p/android-xserver/issues
+Source Code:https://github.com/mattkwan/android-xserver
+Issue Tracker:https://github.com/mattkwan/android-xserver/issues
 
 Auto Name:X Server
 Summary:Display remote X11 apps
@@ -14,7 +14,7 @@ use graphical apps according to the instructions on
 .
 
 Repo Type:git
-Repo:https://code.google.com/p/android-xserver
+Repo:https://github.com/mattkwan/android-xserver
 
 Build:1.02,2
     commit=5811ae984ea0