diff --git a/.gitmodules b/.gitmodules
index 2a1f087e7446..7c26c6c2c12d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "vendor/native_mate"]
 	path = vendor/native_mate
 	url = https://github.com/zcbenz/native-mate.git
+[submodule "vendor/crashpad"]
+	path = vendor/crashpad
+	url = https://github.com/atom/crashpad.git
diff --git a/script/bootstrap.py b/script/bootstrap.py
index 88dfaad53d7f..f67a790a04ce 100755
--- a/script/bootstrap.py
+++ b/script/bootstrap.py
@@ -12,7 +12,6 @@ from lib.util import execute_stdout, get_atom_shell_version, scoped_cwd
 SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
 VENDOR_DIR = os.path.join(SOURCE_ROOT, 'vendor')
 PYTHON_26_URL = 'https://chromium.googlesource.com/chromium/deps/python_26'
-CRACKPAD_URL = 'https://github.com/hokein/crashpad.git'
 NPM = 'npm.cmd' if sys.platform in ['win32', 'cygwin'] else 'npm'
 
 
@@ -28,8 +27,6 @@ def main():
     update_win32_python()
   update_submodules()
   update_node_modules('.')
-  if sys.platform == 'darwin':
-    update_crashpad()
   bootstrap_brightray(args.dev, args.url, args.target_arch)
 
   create_chrome_version_h()
@@ -95,18 +92,6 @@ def update_node_modules(dirname, env=None):
       execute_stdout([NPM, 'install'], env)
 
 
-def update_crashpad():
-  gclient = os.path.join(VENDOR_DIR, 'depot_tools', 'gclient.py')
-  args = [
-    'config',
-    '--unmanaged',
-    CRACKPAD_URL,
-  ]
-  with scoped_cwd(VENDOR_DIR):
-    execute_stdout([sys.executable, gclient] + args)
-    execute_stdout([sys.executable, gclient] +  ['sync'])
-
-
 def update_electron_modules(dirname, target_arch):
   env = os.environ.copy()
   env['npm_config_arch']    = target_arch