diff --git a/DEPS b/DEPS
index 74e2522f..0c7f66be 100644
--- a/DEPS
+++ b/DEPS
@@ -25,7 +25,7 @@ deps = {
       'd62d6c6556d96dda924382547c54a4b3afedb22c',
   'crashpad/third_party/gyp/gyp':
       Var('chromium_git') + '/external/gyp@' +
-      'a7055b3989c1074adca03b4b4829e7f0e57f6efd',
+      'ffd524cefaad622e72995e852ffb0b18e83f8054',
 
   # TODO(scottmg): Consider pinning these. For now, we don't have any particular
   # reason to do so.
diff --git a/doc/developing.md b/doc/developing.md
index 429fff7f..b5ee935e 100644
--- a/doc/developing.md
+++ b/doc/developing.md
@@ -36,9 +36,14 @@ provides more detail.
 To develop Crashpad, the following tools are necessary, and must be present in
 the `$PATH` environment variable:
 
- * Appropriate development tools. For macOS, this is
-   [Xcode](https://developer.apple.com/xcode/) and for Windows, it’s [Visual
-   Studio](https://www.visualstudio.com/).
+ * Appropriate development tools.
+    * On macOS, install [Xcode](https://developer.apple.com/xcode/). The latest
+      version is generally recommended.
+    * On Windows, install [Visual Studio](https://www.visualstudio.com/) with
+      C++ support and the Windows SDK. MSVS 2015 and MSVS 2017 are both
+      supported. Some tests also require the CDB debugger, installed with
+      [Debugging Tools for
+      Windows](https://msdn.microsoft.com/library/windows/hardware/ff551063.aspx).
  * Chromium’s
    [depot_tools](https://dev.chromium.org/developers/how-tos/depottools).
  * [Git](https://git-scm.com/). This is provided by Xcode on macOS and by
@@ -191,6 +196,18 @@ $ cd ~/crashpad/crashpad
 $ python build/run_tests.py out/Debug
 ```
 
+### Windows
+
+On Windows, `end_to_end_test.py` requires the CDB debugger, installed with
+[Debugging Tools for
+Windows](https://msdn.microsoft.com/library/windows/hardware/ff551063.aspx).
+This can be installed either as part of the [Windows Driver
+Kit](https://go.microsoft.com/fwlink/p?LinkID=239721) or the [Windows
+SDK](https://go.microsoft.com/fwlink/p?LinkID=271979). If the Windows SDK has
+already been installed (possibly with Visual Studio) but Debugging Tools for
+Windows is not present, it can be installed from Add or remove programs→Windows
+Software Development Kit.
+
 ### Android
 
 To test on Android, use [ADB (Android Debug