diff --git a/doc/manual.html b/doc/manual.html
index 46c2518897bb3b6a2a8b780ffafb4b2686327e72..fccf7d6416d5099a9a3039489dd033fd33591b76 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2045,7 +2045,7 @@
 </section>
 
 <section id=addons>
-    <h2>Addons</h2>
+    <h2 id="addons">Addons</h2>
 
     <p>The <code>addon</code> directory in the distribution contains a
     number of reusable components that implement extra editor
diff --git a/index.html b/index.html
index 7a2bbdcfcef4e386ea94fbdaa3a0ccee3fd87607..cf9f943ac58cf9e4a3972eb1297ec1edb123b266 100644
--- a/index.html
+++ b/index.html
@@ -40,7 +40,7 @@
 <section id=description class=first>
   <p><strong>CodeMirror</strong> is a versatile text editor
   implemented in JavaScript for the browser. It is specialized for
-  editing code, and comes with a number of language modes and addons
+  editing code, and comes with a number of <a href="mode/index.html">language modes</a> and <a href="doc/manual.html#addons">addons</a>
   that implement more advanced editing functionality.</p>
 
   <p>A rich <a href="doc/manual.html#api">programming API</a> and a