diff --git a/metadata/com.ichi2.anki.txt b/metadata/com.ichi2.anki.txt
index 97cf66ae1e..ae812de95f 100644
--- a/metadata/com.ichi2.anki.txt
+++ b/metadata/com.ichi2.anki.txt
@@ -1,8 +1,8 @@
 Category:Science & Education
 License:GPLv3
 Web Site:https://code.google.com/p/ankidroid/wiki/Index
-Source Code:http://github.com/nicolas-raoul/Anki-Android/
-Issue Tracker:http://code.google.com/p/ankidroid/issues
+Source Code:http://github.com/ankidroid/Anki-Android
+Issue Tracker:http://github.com/ankidroid/Anki-Android/issues
 
 Summary:A flashcard-based study aid
 Description:
@@ -13,24 +13,25 @@ port of Anki, and is compatible with Anki data.
 .
 
 Repo Type:git
-Repo:git://github.com/nicolas-raoul/Anki-Android.git
+# Old repo - Repo:git://github.com/nicolas-raoul/Anki-Android.git
+# Some tags and refs are missing in the new repo
+Repo:git://github.com/ankidroid/Anki-Android.git
 
 #Build Version:0.4.2,12,v0.4.2
 #Build Version:0.5,18,v0.5
 #Build Version:0.5.1,19,!There is a v0.5.1 tag but the version code is not right
-Build Version:0.6,20,f26b7662ae9db9a92d21
+#Build Version:0.6,20,f26b7662ae9db9a92d21
 Build Version:0.7,21,v0.7
-Build Version:1.0,22,v1.0,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
 Build Version:1.0,23,!Version with Bluetooth
 Build Version:1.1,25,v1.1,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
 Build Version:2.0,30,4e4bafed59,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-Build Version:2.0.1,32,eac0483a9
+Build Version:2.0,31,!Different version code - same version?
+Build Version:2.0.1,32,v2.0.1,prebuild=sed -i -e "/^key\./d" *.properties
 
 Auto Update Mode:None
-# Releases have own branches; v2.0.1 tag couldn't be checked-out
-Update Check Mode:Market
+Update Check Mode:Tags
 Current Version:2.0.1
 Current Version Code:32