diff --git a/Telegram/build/build.bat b/Telegram/build/build.bat
index 97683e4367..7396e6dfd2 100644
--- a/Telegram/build/build.bat
+++ b/Telegram/build/build.bat
@@ -95,12 +95,12 @@ if %Build64% neq 0 (
   set "UpdateFile=tx64upd%AppVersion%"
   set "SetupFile=tsetup-x64.%AppVersionStrFull%.exe"
   set "PortableFile=tportable-x64.%AppVersionStrFull%.zip"
-  set "DumpSymsPath=%SolutionPath%\..\..\Libraries\win64\breakpad\src\tools\windows\dump_syms\Release\dump_syms.exe"
+  set "DumpSymsPath=%SolutionPath%\..\..\Libraries\win64\breakpad\src\out\Release_x64\dump_syms.exe"
 ) else (
   set "UpdateFile=tupdate%AppVersion%"
   set "SetupFile=tsetup.%AppVersionStrFull%.exe"
   set "PortableFile=tportable.%AppVersionStrFull%.zip"
-  set "DumpSymsPath=%SolutionPath%\..\..\Libraries\breakpad\src\tools\windows\dump_syms\Release\dump_syms.exe"
+  set "DumpSymsPath=%SolutionPath%\..\..\Libraries\breakpad\src\out\Release\dump_syms.exe"
 )
 set "ReleasePath=%SolutionPath%\Release"
 set "DeployPath=%ReleasePath%\deploy\%AppVersionStrMajor%\%AppVersionStrFull%"
diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index 9aba7b6cb7..850720d620 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -592,15 +592,20 @@ depends:patches/breakpad.diff
     git apply ../patches/breakpad.diff
     git clone https://github.com/google/googletest src/testing
 win:
+    if "%X8664%" equ "x64" (
+        set "FolderPostfix=_x64"
+    ) else (
+        set "FolderPostfix="
+    )
     cd src\\client\\windows
     gyp --no-circular-check breakpad_client.gyp --format=ninja
     cd ..\\..
-    ninja -C out/Debug common crash_generation_client exception_handler
-    ninja -C out/Release common crash_generation_client exception_handler
+    ninja -C out/Debug%FolderPostfix% common crash_generation_client exception_handler
+    ninja -C out/Release%FolderPostfix% common crash_generation_client exception_handler
     cd tools\\windows\\dump_syms
     gyp dump_syms.gyp --format=ninja
     cd ..\\..\\..
-    ninja -C out/Release dump_syms
+    ninja -C out/Release%FolderPostfix% dump_syms
 mac:
     git clone https://chromium.googlesource.com/linux-syscall-support src/third_party/lss
     cd src/third_party/lss