--- a/build/docs/toolchains.rst
+++ b/build/docs/toolchains.rst
@@ -31,30 +31,39 @@ publicly. However, the same tool can be 
 Configuring Your System
 -----------------------
 
 It is **highly** recommended to perform this process on a fresh installation
 of Windows 7 or 10 (such as in a VM). Installing all updates through
 Windows Update is not only acceptable - it is encouraged. Although it
 shouldn't matter.
 
-Next, install Visual Studio 2015 Community. The download link can be
-found at https://www.visualstudio.com/en-us/products/visual-studio-community-vs.aspx.
-Be sure to follow these install instructions:
+Next, install Visual Studio 2015 Community. Microsoft isn't offering
+downloads of prior versions via the public website. So you'll need to sign
+up for an account to get the download link. Load
+https://my.visualstudio.com/downloads?q=visual%20studio%20community%202015,
+sign in, and download the Visual Studio 2015 Community installer and run it.
+Then follow these install instructions:
 
 1. Choose a ``Custom`` installation and click ``Next``
 2. Select ``Programming Languages`` -> ``Visual C++`` (make sure all sub items are
    selected)
 3. Under ``Windows and Web Development`` uncheck everything except
    ``Universal Windows App Development Tools`` and the items under it
    (should be ``Tools (1.3.1)...`` and the ``Windows 10 SDK``).
 
-Once Visual Studio 2015 Community has been installed, from a checkout
-of mozilla-central, run something like the following to produce a ZIP
-archive::
+Next, install the Debugging Tools for Windows via the Windows 10 SDK installer.
+
+1. Download and run the installer at
+   https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk
+2. Select the ``Debugging Tools for Windows`` checkbox and uncheck everything
+   else.
+
+Once the prerequisites are installed, from a checkout of mozilla-central,
+run something like the following to produce a ZIP archive::
 
    $ ./mach python build/windows_toolchain.py create-zip vs2015u3
 
 The produced archive will be the argument to ``create-zip`` + ``.zip``.
 
 Firefox for Android with Gradle
 ===============================
 

--- a/build/windows_toolchain.py
+++ b/build/windows_toolchain.py
@@ -87,16 +87,19 @@ VS_PATTERNS = [
 SDK_RELEASE = '10.0.14393.0'
 
 # Files from the Windows 10 SDK to install.
 SDK_PATTERNS = [
     {
         'pattern': 'bin/x64/**',
     },
     {
+        'pattern': 'Debuggers/x64/srcsrv/**',
+    },
+    {
         'pattern': 'Include/%s/**' % SDK_RELEASE,
     },
     {
         'pattern': 'Lib/%s/ucrt/x64/**' % SDK_RELEASE,
     },
     {
         'pattern': 'Lib/%s/ucrt/x86/**' % SDK_RELEASE,
     },