diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index a20191a2ba..bf75440733 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -9,7 +9,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="2.1.17.0" />
+    Version="2.1.18.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram FZ-LLC</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 3863a0ba7d..48e71950a3 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,1,17,0
- PRODUCTVERSION 2,1,17,0
+ FILEVERSION 2,1,18,0
+ PRODUCTVERSION 2,1,18,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "2.1.17.0"
+            VALUE "FileVersion", "2.1.18.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.1.17.0"
+            VALUE "ProductVersion", "2.1.18.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 25630bcad7..6c71d6a0b4 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,1,17,0
- PRODUCTVERSION 2,1,17,0
+ FILEVERSION 2,1,18,0
+ PRODUCTVERSION 2,1,18,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "2.1.17.0"
+            VALUE "FileVersion", "2.1.18.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.1.17.0"
+            VALUE "ProductVersion", "2.1.18.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp
index a970f86437..a9e01a0dbd 100644
--- a/Telegram/SourceFiles/core/changelogs.cpp
+++ b/Telegram/SourceFiles/core/changelogs.cpp
@@ -60,7 +60,15 @@ std::map<int, const char*> BetaLogs() {
 		"- Fix high definition GIF animations opening in media viewer.\n"
 
 		"- Multiple crash fixes."
-	}
+	},
+	{
+		2001018,
+		"- Fix a possible crash in Picture-in-Picture video player.\n"
+
+		"- Fix copying links from message texts.\n"
+
+		"- Allow using system window frame in Windows and Linux."
+	},
 	};
 };
 
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 0047900078..78f9351de2 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
 constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
 constexpr auto AppName = "Telegram Desktop"_cs;
 constexpr auto AppFile = "Telegram"_cs;
-constexpr auto AppVersion = 2001017;
-constexpr auto AppVersionStr = "2.1.17";
+constexpr auto AppVersion = 2001018;
+constexpr auto AppVersionStr = "2.1.18";
 constexpr auto AppBetaVersion = true;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 9c3b3678cf..85b4d47263 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         2001017
+AppVersion         2001018
 AppVersionStrMajor 2.1
-AppVersionStrSmall 2.1.17
-AppVersionStr      2.1.17
+AppVersionStrSmall 2.1.18
+AppVersionStr      2.1.18
 BetaChannel        1
 AlphaVersion       0
-AppVersionOriginal 2.1.17.beta
+AppVersionOriginal 2.1.18.beta
diff --git a/changelog.txt b/changelog.txt
index f09a71aaed..e2e3f482f7 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+2.1.18 beta (08.07.20)
+
+- Fix a possible crash in Picture-in-Picture video player.
+- Fix copying links from message texts.
+- Allow using system window frame in Windows and Linux.
+
 2.1.17 beta (02.07.20)
 
 - Fix messages editing in a non-active account.