diff --git a/Telegram/SourceFiles/core/update_checker.cpp b/Telegram/SourceFiles/core/update_checker.cpp
index c4e94f8d95..850e1535e1 100644
--- a/Telegram/SourceFiles/core/update_checker.cpp
+++ b/Telegram/SourceFiles/core/update_checker.cpp
@@ -224,6 +224,7 @@ QString FindUpdateFile() {
 		if (QRegularExpression(
 			"^("
 			"tupdate|"
+			"tx64upd|"
 			"tmacupd|"
 			"tosxupd|"
 			"tlinuxupd|"
diff --git a/Telegram/build/deploy.sh b/Telegram/build/deploy.sh
index ea4bde9bb1..e1b9c44980 100755
--- a/Telegram/build/deploy.sh
+++ b/Telegram/build/deploy.sh
@@ -49,6 +49,7 @@ HomePath="$FullScriptPath/.."
 DeployMac="0"
 DeployOsx="0"
 DeployWin="0"
+DeployWin64="0"
 DeployLinux="0"
 DeployLinux32="0"
 if [ "$DeployTarget" == "mac" ]; then
@@ -59,7 +60,10 @@ elif [ "$DeployTarget" == "osx" ]; then
   echo "Deploying version $AppVersionStrFull for OS X 10.10 and 10.11.."
 elif [ "$DeployTarget" == "win" ]; then
   DeployWin="1"
-  echo "Deploying version $AppVersionStrFull for Windows.."
+  echo "Deploying version $AppVersionStrFull for Windows 32 bit.."
+elif [ "$DeployTarget" == "win64" ]; then
+  DeployWin64="1"
+  echo "Deploying version $AppVersionStrFull for Windows 64 bit.."
 elif [ "$DeployTarget" == "linux" ]; then
   DeployLinux="1"
   echo "Deploying version $AppVersionStrFull for Linux 64 bit.."
@@ -69,8 +73,9 @@ elif [ "$DeployTarget" == "linux32" ]; then
 else
   DeployMac="1"
   DeployWin="1"
+  DeployWin64="1"
   DeployLinux="1"
-  echo "Deploying three versions of $AppVersionStrFull: for Windows, macOS and Linux 64 bit.."
+  echo "Deploying four versions of $AppVersionStrFull: for Windows 32 bit, Windows 64 bit, macOS and Linux 64 bit.."
 fi
 if [ "$BuildTarget" == "mac" ]; then
   BackupPath="$HOME/Projects/backup/tdesktop"
@@ -92,6 +97,11 @@ WinUpdateFile="tupdate$AppVersion"
 WinSetupFile="tsetup.$AppVersionStrFull.exe"
 WinPortableFile="tportable.$AppVersionStrFull.zip"
 WinRemoteFolder="tsetup"
+Win64DeployPath="$BackupPath/$AppVersionStrMajor/$AppVersionStrFull/tx64"
+Win64UpdateFile="tx64upd$AppVersion"
+Win64SetupFile="tsetup-x64.$AppVersionStrFull.exe"
+Win64PortableFile="tportable-x64.$AppVersionStrFull.zip"
+Win64RemoteFolder="tx64"
 LinuxDeployPath="$BackupPath/$AppVersionStrMajor/$AppVersionStrFull/tlinux"
 LinuxUpdateFile="tlinuxupd$AppVersion"
 LinuxSetupFile="tsetup.$AppVersionStrFull.tar.xz"
@@ -105,6 +115,8 @@ DeployPath="$BackupPath/$AppVersionStrMajor/$AppVersionStrFull"
 if [ "$AlphaVersion" != "0" ]; then
   if [ "$DeployTarget" == "win" ]; then
     AlphaFilePath="$WinDeployPath/$AlphaKeyFile"
+  elif [ "$DeployTarget" == "win64" ]; then
+    AlphaFilePath="$Win64DeployPath/$AlphaKeyFile"
   elif [ "$DeployTarget" == "osx" ]; then
     AlphaFilePath="$OsxDeployPath/$AlphaKeyFile"
   elif [ "$DeployTarget" == "linux" ]; then
@@ -128,6 +140,8 @@ if [ "$AlphaVersion" != "0" ]; then
   OsxSetupFile="talpha${AlphaVersion}_${AlphaSignature}.zip"
   WinUpdateFile="${WinUpdateFile}_${AlphaSignature}"
   WinPortableFile="talpha${AlphaVersion}_${AlphaSignature}.zip"
+  Win64UpdateFile="${Win64UpdateFile}_${AlphaSignature}"
+  Win64PortableFile="talpha${AlphaVersion}_${AlphaSignature}.zip"
   LinuxUpdateFile="${LinuxUpdateFile}_${AlphaSignature}"
   LinuxSetupFile="talpha${AlphaVersion}_${AlphaSignature}.tar.xz"
   Linux32UpdateFile="${Linux32UpdateFile}_${AlphaSignature}"
@@ -163,6 +177,19 @@ if [ "$DeployWin" == "1" ]; then
     Error "$WinPortableFile not found!"
   fi
 fi
+if [ "$DeployWin64" == "1" ]; then
+  if [ ! -f "$Win64DeployPath/$Win64UpdateFile" ]; then
+    Error "$Win64UpdateFile not found!"
+  fi
+  if [ "$AlphaVersion" == "0" ]; then
+    if [ ! -f "$Win64DeployPath/$Win64SetupFile" ]; then
+      Error "$Win64SetupFile not found!"
+    fi
+  fi
+  if [ ! -f "$Win64DeployPath/$Win64PortableFile" ]; then
+    Error "$Win64PortableFile not found!"
+  fi
+fi
 if [ "$DeployLinux" == "1" ]; then
   if [ ! -f "$LinuxDeployPath/$LinuxUpdateFile" ]; then
     Error "$LinuxDeployPath/$LinuxUpdateFile not found!"
@@ -195,6 +222,12 @@ if [ "$DeployWin" == "1" ]; then
     Files+=("tsetup/$WinSetupFile")
   fi
 fi
+if [ "$DeployWin64" == "1" ]; then
+  Files+=("tx64/$Win64UpdateFile" "tx64/$Win64PortableFile")
+  if [ "$AlphaVersion" == "0" ]; then
+    Files+=("tx64/$Win64SetupFile")
+  fi
+fi
 if [ "$DeployLinux" == "1" ]; then
   Files+=("tlinux/$LinuxUpdateFile" "tlinux/$LinuxSetupFile")
 fi
diff --git a/Telegram/build/release.py b/Telegram/build/release.py
index 5253a25abe..bb32ba7fe6 100644
--- a/Telegram/build/release.py
+++ b/Telegram/build/release.py
@@ -168,14 +168,28 @@ files.append({
   'remote': 'tsetup.' + version_full + '.exe',
   'backup_folder': 'tsetup',
   'mime': 'application/octet-stream',
-  'label': 'Windows: Installer',
+  'label': 'Windows 32 bit: Installer',
 })
 files.append({
   'local': 'tportable.' + version_full + '.zip',
   'remote': 'tportable.' + version_full + '.zip',
   'backup_folder': 'tsetup',
   'mime': 'application/zip',
-  'label': 'Windows: Portable',
+  'label': 'Windows 32 bit: Portable',
+})
+files.append({
+  'local': 'tsetup-x64.' + version_full + '.exe',
+  'remote': 'tsetup-x64.' + version_full + '.exe',
+  'backup_folder': 'tx64',
+  'mime': 'application/octet-stream',
+  'label': 'Windows 64 bit: Installer',
+})
+files.append({
+  'local': 'tportable-x64.' + version_full + '.zip',
+  'remote': 'tportable-x64.' + version_full + '.zip',
+  'backup_folder': 'tx64',
+  'mime': 'application/zip',
+  'label': 'Windows 64 bit: Portable',
 })
 files.append({
   'local': 'tsetup.' + version_full + '.dmg',
diff --git a/Telegram/lib_base b/Telegram/lib_base
index d7342985eb..f770025cc1 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit d7342985eb85b0ab791dee0514cffb0b05b3010d
+Subproject commit f770025cc18e2fba295733923a527c8cb0f1d513