diff --git a/metadata/org.telegram.messenger.txt b/metadata/org.telegram.messenger.txt
index 56b7f16e59..2dcc5bf015 100644
--- a/metadata/org.telegram.messenger.txt
+++ b/metadata/org.telegram.messenger.txt
@@ -2,16 +2,15 @@ AntiFeatures:NonFreeNet,UpstreamNonFree
 Categories:Internet
 License:GPL-2.0+
 Web Site:https://telegram.org
-Source Code:https://github.com/slp/Telegram-FOSS
-Issue Tracker:https://github.com/slp/Telegram-FOSS/issues
-Changelog:https://github.com/slp/Telegram-FOSS/blob/HEAD/Changelog.md
-Donate:https://sinrega.org/?page_id=241
+Source Code:https://github.com/Telegram-FOSS-Team/Telegram-FOSS
+Issue Tracker:https://github.com/Telegram-FOSS-Team/Telegram-FOSS/issues
+Changelog:https://github.com/Telegram-FOSS-Team/Telegram-FOSS/blob/HEAD/Changelog.md
 
 Auto Name:Telegram
 Summary:Messaging client
 Description:
 '''Warning:''' While this build is based on a pure-floss fork, original upstream
-has not published the sourcecode for recent vesions.
+is not always fast with publishing the sourcecode for recent vesions.
 
 Client for the Telegram messaging platform. Chat with friends, start group chats
 and share all kinds of content. All of your messages and conversations are
@@ -21,9 +20,9 @@ The messaging platform is aimed at mobile devices, but desktop and web clients
 exist as well.
 
 Several proprietary parts were removed from the original Telegram client,
-including Google Play Services for the location services and HockeySDK for
-self-updates. Push notifications through Google Cloud Messaging and the
-automatic SMS receiving features were also removed.
+including Google Play Services for the location services, HockeySDK for
+self-updates and push notifications through Google Cloud Messaging. Location
+sharing functionality is restored using OpenStreetMap.
 
 Anti-Feature: Non-Free Network, since the servers run proprietary software.
 
@@ -33,7 +32,7 @@ certain lag.
 .
 
 Repo Type:git
-Repo:https://github.com/slp/Telegram-FOSS.git
+Repo:https://github.com/Telegram-FOSS-Team/Telegram-FOSS.git
 
 Build:1.3.21,160
     commit=v1.3.21a
@@ -261,10 +260,16 @@ Build:3.13.1,8513
     build=$$NDK$$/ndk-build && \
         gradle nativeLibsToJar
 
+Build:3.18.0,9575
+    commit=v3.18.0
+    subdir=TMessagesProj
+    submodules=yes
+    gradle=fat
+
 Auto Update Mode:Version v%v
 Update Check Mode:Tags
-Vercode Operation:%c*10 + 3
-Current Version:3.13.1
-Current Version Code:8513
+Vercode Operation:%c*10 + 5
+Current Version:3.18.0
+Current Version Code:9575
 
-No Source Since:3.13.2
+No Source Since:3.18.1