diff --git a/Telegram/gyp/telegram_mac.gypi b/Telegram/gyp/telegram_mac.gypi
index 89037fd70..16a9743de 100644
--- a/Telegram/gyp/telegram_mac.gypi
+++ b/Telegram/gyp/telegram_mac.gypi
@@ -123,7 +123,7 @@
       'postbuild_name': 'Copy crashpad_handler to Helpers',
       'action': [
         'cp',
-        '<(libs_loc)/crashpad_oldmac/crashpad/out/${CONFIGURATION}/crashpad_handler',
+        '<(libs_loc)/macold/crashpad/out/${CONFIGURATION}/crashpad_handler',
         '${BUILT_PRODUCTS_DIR}/Telegram.app/Contents/Helpers/',
       ],
     }],
@@ -141,8 +141,8 @@
       ],
     },
     'include_dirs': [
-      '<(libs_loc)/crashpad/crashpad',
-      '<(libs_loc)/crashpad/crashpad/third_party/mini_chromium/mini_chromium',
+      '<(libs_loc)/crashpad',
+      '<(libs_loc)/crashpad/third_party/mini_chromium/mini_chromium',
       '<(libs_loc)/openssl-xcode/include'
     ],
     'library_dirs': [
@@ -151,12 +151,12 @@
     'configurations': {
       'Debug': {
         'library_dirs': [
-          '<(libs_loc)/crashpad/crashpad/out/Debug',
+          '<(libs_loc)/crashpad/out/Debug',
         ],
       },
       'Release': {
         'library_dirs': [
-          '<(libs_loc)/crashpad/crashpad/out/Release',
+          '<(libs_loc)/crashpad/out/Release',
         ],
       },
     },
@@ -190,7 +190,7 @@
       'postbuild_name': 'Copy crashpad_client to Helpers',
       'action': [
         'cp',
-        '<(libs_loc)/crashpad/crashpad/out/${CONFIGURATION}/crashpad_handler',
+        '<(libs_loc)/crashpad/out/${CONFIGURATION}/crashpad_handler',
         '${BUILT_PRODUCTS_DIR}/Telegram.app/Contents/Helpers/',
       ],
     }],
diff --git a/docs/building-xcode-old.md b/docs/building-xcode-old.md
index 90b9fcf85..a28930d78 100644
--- a/docs/building-xcode-old.md
+++ b/docs/building-xcode-old.md
@@ -233,6 +233,7 @@ In Terminal go to **/Users/user/TBuild/Libraries/macold** and run:
     git clone https://chromium.googlesource.com/external/github.com/google/googletest gtest
     cd gtest
     git checkout d62d6c6556
+    cd ../../../
 
     build/gyp_crashpad.py -Dmac_deployment_target=10.6
     ninja -C out/Debug
diff --git a/docs/building-xcode.md b/docs/building-xcode.md
index 4a49c927f..41d222a1b 100644
--- a/docs/building-xcode.md
+++ b/docs/building-xcode.md
@@ -221,14 +221,22 @@ In Terminal go to **/Users/user/TBuild/Libraries** and run:
 
 In Terminal go to **/Users/user/TBuild/Libraries** and run:
 
-    export PATH=/Users/user/TBuild/Libraries/depot_tools:$PATH:/Users/user/TBuild/Libraries/gyp
-    mkdir crashpad
+    git clone https://chromium.googlesource.com/crashpad/crashpad.git
     cd crashpad
-    fetch crashpad
-    cd crashpad/third_party/mini_chromium/mini_chromium
-    git apply ../../../../../../tdesktop/Telegram/Patches/mini_chromium.diff
+    git checkout feb3aa3923
+    cd third_party/mini_chromium
+    git clone https://chromium.googlesource.com/chromium/mini_chromium
+    cd mini_chromium
+    git checkout 7c5b0c1ab4
+    git apply ../../../../../tdesktop/Telegram/Patches/mini_chromium.diff
+    cd ../../gtest
+    git clone https://chromium.googlesource.com/external/github.com/google/googletest gtest
+    cd gtest
+    git checkout d62d6c6556
     cd ../../../
+
     build/gyp_crashpad.py -Dmac_deployment_target=10.8
+    ninja -C out/Debug
     ninja -C out/Release
 
 #### Prepare GYP