diff --git a/src/source/building.jd b/src/source/building.jd
index ecb52db..fbfb427 100644
--- a/src/source/building.jd
+++ b/src/source/building.jd
@@ -28,6 +28,10 @@
 branches, including <code>master</code>. The basic sequence of build commands
 is as follows:</p>
 
+<p class="note"><strong>Note:</strong> If you're building Android 6.0 or later,
+please see <a href="jack.html">Compiling with Jack</a> for information on this
+new default toolchain.</p>
+
 <h2 id="initialize">Set up environment</h2>
 <p>Initialize the environment with the <code>envsetup.sh</code> script. Note
 that replacing <code>source</code> with <code>.</code> (a single dot) saves a few characters,
diff --git a/src/source/source_toc.cs b/src/source/source_toc.cs
index 52b5bac..d886a3c 100644
--- a/src/source/source_toc.cs
+++ b/src/source/source_toc.cs
@@ -41,6 +41,7 @@
         <li><a href="<?cs var:toroot ?>source/initializing.html">Establishing a Build Environment</a></li>
         <li><a href="<?cs var:toroot ?>source/downloading.html">Downloading the Source</a></li>
         <li><a href="<?cs var:toroot ?>source/building.html">Building the System</a></li>
+        <li><a href="<?cs var:toroot ?>source/jack.html">Compiling with Jack</a></li>
         <li><a href="<?cs var:toroot ?>source/running.html">Running Builds</a></li>
         <li><a href="<?cs var:toroot ?>source/building-kernels.html">Building Kernels</a></li>
         <li><a href="<?cs var:toroot ?>source/known-issues.html">Known Issues</a></li>