diff --git a/Telegram/DeployLinux.sh b/Telegram/DeployLinux.sh
index 2629cc776b41f..04848c38d28a6 100755
--- a/Telegram/DeployLinux.sh
+++ b/Telegram/DeployLinux.sh
@@ -1,5 +1,5 @@
-AppVersionStr=0.6.3
-AppVersion=6003
+AppVersionStr=0.6.4
+AppVersion=6004
 
 if [ ! -f "./../Linux/Release/deploy/$AppVersionStr/tlinuxupd$AppVersion" ]; then
     echo "tlinuxupd$AppVersion not found!";
diff --git a/Telegram/DeployLinux32.sh b/Telegram/DeployLinux32.sh
index c5d26d72338c0..0838a283bd9d4 100755
--- a/Telegram/DeployLinux32.sh
+++ b/Telegram/DeployLinux32.sh
@@ -1,5 +1,5 @@
-AppVersionStr=0.6.3
-AppVersion=6003
+AppVersionStr=0.6.4
+AppVersion=6004
 
 if [ ! -f "./../Linux/Release/deploy/$AppVersionStr/tlinux32upd$AppVersion" ]; then
     echo "tlinux32upd$AppVersion not found!"
diff --git a/Telegram/DeployMacWin.sh b/Telegram/DeployMacWin.sh
index db7d01566cbbe..890af3807f5bd 100755
--- a/Telegram/DeployMacWin.sh
+++ b/Telegram/DeployMacWin.sh
@@ -1,5 +1,5 @@
-AppVersionStr=0.6.3
-AppVersion=6003
+AppVersionStr=0.6.4
+AppVersion=6004
 
 if [ ! -f "./../Mac/Release/deploy/$AppVersionStr/tmacupd$AppVersion" ]; then
     echo "tmacupd$AppVersion not found!"
diff --git a/Telegram/DeployWin.sh b/Telegram/DeployWin.sh
new file mode 100644
index 0000000000000..4beec39a9418c
--- /dev/null
+++ b/Telegram/DeployWin.sh
@@ -0,0 +1,21 @@
+AppVersionStr=0.6.4
+AppVersion=6004
+
+if [ ! -f "./../Win32/Deploy/deploy/$AppVersionStr/tupdate$AppVersion" ]; then
+    echo "tupdate$AppVersion not found!"
+    exit 1
+fi
+
+if [ ! -f "./../Win32/Deploy/deploy/$AppVersionStr/tportable.$AppVersionStr.zip" ]; then
+    echo "tportable.$AppVersionStr.zip not found!"
+    exit 1
+fi
+
+if [ ! -f "./../Win32/Deploy/deploy/$AppVersionStr/tsetup.$AppVersionStr.exe" ]; then
+    echo "tsetup.$AppVersionStr.exe not found!"
+    exit 1
+fi
+
+cp -v ./../Win32/Deploy/deploy/$AppVersionStr/tupdate$AppVersion /z/TBuild/tother/tsetup/
+cp -v ./../Win32/Deploy/deploy/$AppVersionStr/tportable.$AppVersionStr.zip /z/TBuild/tother/tsetup/
+cp -v ./../Win32/Deploy/deploy/$AppVersionStr/tsetup.$AppVersionStr.exe /z/TBuild/tother/tsetup/
diff --git a/Telegram/PrepareLinux.sh b/Telegram/PrepareLinux.sh
index 80fbf5fb11664..41fe51b84015a 100755
--- a/Telegram/PrepareLinux.sh
+++ b/Telegram/PrepareLinux.sh
@@ -1,5 +1,5 @@
-AppVersionStr=0.6.3
-AppVersion=6003
+AppVersionStr=0.6.4
+AppVersion=6004
 
 if [ -d "./../Linux/Release/deploy/$AppVersionStr" ]; then
   echo "Deploy folder for version $AppVersionStr already exists!"
diff --git a/Telegram/PrepareLinux32.sh b/Telegram/PrepareLinux32.sh
index 5f7fd9fe5ffca..404a500e25edc 100755
--- a/Telegram/PrepareLinux32.sh
+++ b/Telegram/PrepareLinux32.sh
@@ -1,5 +1,5 @@
-AppVersionStr=0.6.3
-AppVersion=6003
+AppVersionStr=0.6.4
+AppVersion=6004
 
 if [ -d "./../Linux/Release/deploy/$AppVersionStr" ]; then
   echo "Deploy folder for version $AppVersionStr already exists!"
diff --git a/Telegram/PrepareMac.sh b/Telegram/PrepareMac.sh
index 0f7bc7a5af11e..fd50160549e72 100755
--- a/Telegram/PrepareMac.sh
+++ b/Telegram/PrepareMac.sh
@@ -1,5 +1,5 @@
-AppVersionStr=0.6.3
-AppVersion=6003
+AppVersionStr=0.6.4
+AppVersion=6004
 
 if [ -d "./../Mac/Release/deploy/$AppVersionStr" ]; then
   echo "Deploy folder for version $AppVersionStr already exists!"
diff --git a/Telegram/Setup.iss b/Telegram/Setup.iss
index b247dac2bb9d9..37a7e62df63e5 100644
--- a/Telegram/Setup.iss
+++ b/Telegram/Setup.iss
@@ -3,9 +3,9 @@
 
 #define MyAppShortName "Telegram"
 #define MyAppName "Telegram Desktop"
-#define MyAppVersion "0.6.3"
-#define MyAppVersionZero "0.6.3"
-#define MyAppFullVersion "0.6.3.0"
+#define MyAppVersion "0.6.4"
+#define MyAppVersionZero "0.6.4"
+#define MyAppFullVersion "0.6.4.0"
 #define MyAppPublisher "Telegram Messenger LLP"
 #define MyAppURL "https://tdesktop.com"
 #define MyAppExeName "Telegram.exe"
diff --git a/Telegram/SignWinSetup.bat b/Telegram/SignWinSetup.bat
index c33f8c607b42a..c19f96b951864 100644
--- a/Telegram/SignWinSetup.bat
+++ b/Telegram/SignWinSetup.bat
@@ -1,3 +1,3 @@
 cd ..\Win32\Deploy
-call ..\..\..\TelegramPrivate\Sign.bat tsetup.0.6.3.exe
+call ..\..\..\TelegramPrivate\Sign.bat tsetup.0.6.4.exe
 cd ..\..\Telegram
diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h
index ead4890814afa..92dba3cff5010 100644
--- a/Telegram/SourceFiles/config.h
+++ b/Telegram/SourceFiles/config.h
@@ -17,8 +17,8 @@ Copyright (c) 2014 John Preston, https://tdesktop.com
 */
 #pragma once
 
-static const int32 AppVersion = 6003;
-static const wchar_t *AppVersionStr = L"0.6.3";
+static const int32 AppVersion = 6004;
+static const wchar_t *AppVersionStr = L"0.6.4";
 
 static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)";
 static const wchar_t *AppName = L"Telegram Desktop";
diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist
index 377e61ec381ad..316ee66605806 100644
--- a/Telegram/Telegram.plist
+++ b/Telegram/Telegram.plist
@@ -11,7 +11,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.6.3</string>
+	<string>0.6.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>NOTE</key>
diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc
index 1fde9fabbd6db..33e58cd593c05 100644
Binary files a/Telegram/Telegram.rc and b/Telegram/Telegram.rc differ
diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj
index d5c68c3414154..be7745a4aeef0 100644
--- a/Telegram/Telegram.xcodeproj/project.pbxproj
+++ b/Telegram/Telegram.xcodeproj/project.pbxproj
@@ -1497,7 +1497,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.6.3;
+				CURRENT_PROJECT_VERSION = 0.6.4;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -1515,7 +1515,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 0.6.3;
+				CURRENT_PROJECT_VERSION = 0.6.4;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_OPTIMIZATION_LEVEL = fast;
 				GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
@@ -1541,10 +1541,10 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.6.3;
+				CURRENT_PROJECT_VERSION = 0.6.4;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DYLIB_COMPATIBILITY_VERSION = 0.6;
-				DYLIB_CURRENT_VERSION = 0.6.3;
+				DYLIB_CURRENT_VERSION = 0.6.4;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -1683,10 +1683,10 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.6.3;
+				CURRENT_PROJECT_VERSION = 0.6.4;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DYLIB_COMPATIBILITY_VERSION = 0.6;
-				DYLIB_CURRENT_VERSION = 0.6.3;
+				DYLIB_CURRENT_VERSION = 0.6.4;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;