diff --git a/getting_started/detail/build-from-source-head.rst b/getting_started/detail/build-from-source-head.rst
index 6807ab6..e00e07e 100644
--- a/getting_started/detail/build-from-source-head.rst
+++ b/getting_started/detail/build-from-source-head.rst
@@ -28,7 +28,7 @@ First, find the toolset corresponding to your compiler in the
 following table (an up-to-date list is always available `in the
 Boost.Build documentation`__).
 
-__ http://www.boost.org/boost-build2/doc/html/bbv2/reference/tools.html
+__ http://www.boost.org/build/doc/html/bbv2/reference/tools.html
 
 .. Note:: If you previously chose a toolset for the purposes of
   `building b2`_, you should assume it won't work and instead
@@ -107,5 +107,5 @@ invoke ``b2`` as follows:
 For a complete description of these and other invocation options,
 please see the `Boost.Build documentation`__.
 
-__ http://www.boost.org/boost-build2/doc/html/bbv2/advanced/invocation.html
+__ http://www.boost.org/build/doc/html/bbv2/overview/invocation.html
 
diff --git a/getting_started/detail/build-from-source-tail.rst b/getting_started/detail/build-from-source-tail.rst
index dd782ac..b05c6a5 100644
--- a/getting_started/detail/build-from-source-tail.rst
+++ b/getting_started/detail/build-from-source-tail.rst
@@ -70,4 +70,4 @@ linker, consider setting up a ``user-config.jam`` file as described
 doesn't work for you, please address questions about configuring Boost
 for your compiler to the `Boost.Build mailing list`_.
 
-__ http://www.boost.org/boost-build2/doc/html/bbv2/advanced/configuration.html
+__ http://www.boost.org/build/doc/html/bbv2/overview/configuration.html
diff --git a/getting_started/unix-variants.html b/getting_started/unix-variants.html
index 09d3052..aa0e18d 100644
--- a/getting_started/unix-variants.html
+++ b/getting_started/unix-variants.html
@@ -330,7 +330,7 @@ the directory where you want Boost.Build to be installed</li>
 <div class="section" id="identify-your-toolset">
 <span id="toolset-name"></span><span id="toolset"></span><h3><a class="toc-backref" href="#id28">5.2.2&nbsp;&nbsp;&nbsp;Identify Your Toolset</a></h3>
 <p>First, find the toolset corresponding to your compiler in the
-following table (an up-to-date list is always available <a class="reference external" href="http://www.boost.org/boost-build2/doc/html/bbv2/reference/tools.html">in the
+following table (an up-to-date list is always available <a class="reference external" href="http://www.boost.org/build/doc/html/bbv2/reference/tools.html">in the
 Boost.Build documentation</a>).</p>
 <div class="note">
 <p class="first admonition-title">Note</p>
@@ -425,7 +425,7 @@ invoke <tt class="docutils literal">b2</tt> as follows:</p>
 b2 <strong>--build-dir=</strong><a class="reference internal" href="#id10"><em>build-directory</em></a> <strong>toolset=</strong><a class="reference internal" href="#toolset-name"><em>toolset-name</em></a> <tt class="docutils literal"> </tt> stage
 </pre>
 <p>For a complete description of these and other invocation options,
-please see the <a class="reference external" href="http://www.boost.org/boost-build2/doc/html/bbv2/advanced/invocation.html">Boost.Build documentation</a>.</p>
+please see the <a class="reference external" href="http://www.boost.org/build/doc/html/bbv2/overview/invocation.html">Boost.Build documentation</a>.</p>
 <p>For example, your session might look like this:</p>
 <pre class="literal-block">
 $ cd ~/<tt class="docutils literal">boost_1_58_0</tt>
@@ -499,7 +499,7 @@ packages for libz and libbz2 if you need those features.  Other
 errors when building Boost libraries are cause for concern.</p>
 <p>If it seems like the build system can't find your compiler and/or
 linker, consider setting up a <tt class="docutils literal"><span class="pre">user-config.jam</span></tt> file as described
-<a class="reference external" href="http://www.boost.org/boost-build2/doc/html/bbv2/advanced/configuration.html">here</a>.  If that isn't your problem or the <tt class="docutils literal"><span class="pre">user-config.jam</span></tt> file
+<a class="reference external" href="http://www.boost.org/build/doc/html/bbv2/overview/configuration.html">here</a>.  If that isn't your problem or the <tt class="docutils literal"><span class="pre">user-config.jam</span></tt> file
 doesn't work for you, please address questions about configuring Boost
 for your compiler to the <a class="reference external" href="http://www.boost.org/more/mailing_lists.htm#jamboost">Boost.Build mailing list</a>.</p>
 <!-- Copyright David Abrahams 2006. Distributed under the Boost -->
diff --git a/getting_started/windows.html b/getting_started/windows.html
index 765d429..eb4004d 100644
--- a/getting_started/windows.html
+++ b/getting_started/windows.html
@@ -357,7 +357,7 @@ bootstrap
 </pre>
 <p>The first command prepares the Boost.Build system for use. The second
 command invokes Boost.Build to build the separately-compiled Boost
-libraries. Please consult the <a class="reference external" href="http://www.boost.org/boost-build2/doc/html/bbv2/overview/invocation.html">Boost.Build documentation</a> for a list
+libraries. Please consult the <a class="reference external" href="http://www.boost.org/build/doc/html/bbv2/overview/invocation.html">Boost.Build documentation</a> for a list
 of allowed options.</p>
 </div>
 <div class="section" id="or-build-binaries-from-source">
@@ -389,7 +389,7 @@ the directory where you want Boost.Build to be installed</li>
 <div class="section" id="identify-your-toolset">
 <span id="toolset-name"></span><span id="toolset"></span><h3><a class="toc-backref" href="#id38">5.2.2&nbsp;&nbsp;&nbsp;Identify Your Toolset</a></h3>
 <p>First, find the toolset corresponding to your compiler in the
-following table (an up-to-date list is always available <a class="reference external" href="http://www.boost.org/boost-build2/doc/html/bbv2/reference/tools.html">in the
+following table (an up-to-date list is always available <a class="reference external" href="http://www.boost.org/build/doc/html/bbv2/reference/tools.html">in the
 Boost.Build documentation</a>).</p>
 <div class="note">
 <p class="first admonition-title">Note</p>
@@ -487,7 +487,7 @@ invoke <tt class="docutils literal">b2</tt> as follows:</p>
 b2 <strong>--build-dir=</strong><a class="reference internal" href="#id12"><em>build-directory</em></a> <strong>toolset=</strong><a class="reference internal" href="#toolset-name"><em>toolset-name</em></a> <strong>--build-type=complete</strong> stage
 </pre>
 <p>For a complete description of these and other invocation options,
-please see the <a class="reference external" href="http://www.boost.org/boost-build2/doc/html/bbv2/advanced/invocation.html">Boost.Build documentation</a>.</p>
+please see the <a class="reference external" href="http://www.boost.org/build/doc/html/bbv2/overview/invocation.html">Boost.Build documentation</a>.</p>
 <p>For example, your session might look like this:<a class="footnote-reference" href="#continuation" id="id14"><sup>3</sup></a></p>
 <pre class="literal-block">
 C:\WINDOWS&gt; cd <tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_58_0</tt>
@@ -568,7 +568,7 @@ packages for libz and libbz2 if you need those features.  Other
 errors when building Boost libraries are cause for concern.</p>
 <p>If it seems like the build system can't find your compiler and/or
 linker, consider setting up a <tt class="docutils literal"><span class="pre">user-config.jam</span></tt> file as described
-<a class="reference external" href="http://www.boost.org/boost-build2/doc/html/bbv2/advanced/configuration.html">here</a>.  If that isn't your problem or the <tt class="docutils literal"><span class="pre">user-config.jam</span></tt> file
+<a class="reference external" href="http://www.boost.org/build/doc/html/bbv2/overview/configuration.html">here</a>.  If that isn't your problem or the <tt class="docutils literal"><span class="pre">user-config.jam</span></tt> file
 doesn't work for you, please address questions about configuring Boost
 for your compiler to the <a class="reference external" href="http://www.boost.org/more/mailing_lists.htm#jamboost">Boost.Build mailing list</a>.</p>
 <span class="target" id="auto-linking"></span><!-- Copyright David Abrahams 2006. Distributed under the Boost -->
diff --git a/getting_started/windows.rst b/getting_started/windows.rst
index 29d5b5e..261ff0f 100644
--- a/getting_started/windows.rst
+++ b/getting_started/windows.rst
@@ -183,7 +183,7 @@ command invokes Boost.Build to build the separately-compiled Boost
 libraries. Please consult the `Boost.Build documentation`__ for a list
 of allowed options.
 
-__ http://www.boost.org/boost-build2/doc/html/bbv2/overview/invocation.html
+__ http://www.boost.org/build/doc/html/bbv2/overview/invocation.html
 
 Or, Build Binaries From Source
 ------------------------------