diff --git a/metadata/org.bombusmod.txt b/metadata/org.bombusmod.txt
index 02a05ac8ac..5b57eb25f5 100644
--- a/metadata/org.bombusmod.txt
+++ b/metadata/org.bombusmod.txt
@@ -1,8 +1,8 @@
 Categories:Internet
 License:GPLv2
 Web Site:http://bombusmod.net.ru
-Source Code:https://code.google.com/p/bm2/source
-Issue Tracker:
+Source Code:https://github.com/BombusMod/BombusMod
+Issue Tracker:https://github.com/BombusMod/BombusMod/issues
 
 Auto Name:BombusMod
 Summary:Messaging client
@@ -11,8 +11,10 @@ Full-featured XMPP client based on a J2ME app. Website and source code docs are
 in Russian.
 .
 
-Repo Type:git-svn
-Repo:https://bm2.googlecode.com/svn/trunk
+# Repo Type:git-svn
+# Repo:https://bm2.googlecode.com/svn/trunk
+Repo Type:git
+Repo:https://github.com/BombusMod/BombusMod
 
 Build:0.8.1304,1304
     commit=1304
@@ -24,16 +26,12 @@ Build:0.8.1304,1304
         ant antenna-preprocess && \
         sed -i 's/${bombus.raw-revision}/-/g' AndroidManifest.xml
 
-Build:0.8.1306,1306
+Build:0.8.1321,1321
     disable=not a release
     commit=unknown - see disabled
     subdir=android
 
-# Use this setup next time
-# Build Version:0.8.1312,1312,1312,\
-# extlibs=antenna/antenna-bin-1.2.1-beta.jar,subdir=android,prebuild=\
-# mv libs/antenna*.jar .,antcommands=release-nonb
 Auto Update Mode:None
 Update Check Mode:RepoManifest
-Current Version:0.8.1306
-Current Version Code:1306
+Current Version:0.8.1321
+Current Version Code:1321