diff --git a/common/content/help.xsl b/common/content/help.xsl
index 03de7060..4a6cc8cc 100644
--- a/common/content/help.xsl
+++ b/common/content/help.xsl
@@ -115,14 +115,15 @@
     <!-- Table of Contents {{{1 -->
 
     <xsl:template name="toc">
-        <xsl:param name="level"/>
+        <xsl:param name="level" select="1"/>
         <xsl:param name="context"/>
+        <xsl:param name="toc"/>
 
         <xsl:variable name="tag" select="concat('h', $level)"/>
         <xsl:variable name="lasttag" select="concat('h', $level - 1)"/>
 
-        <xsl:variable name="nodes" select="//following-sibling::liberator:*[
-            local-name() = $tag and preceding-sibling::*[local-name() = $lasttag][position() = 1 and . = $context]]"/>
+        <xsl:variable name="nodes" select="$toc/*[
+            local-name() = $tag and not(preceding::*[local-name() = $lasttag][position() = 1 and not(.=$context)])]"/>
 
         <xsl:if test="$nodes">
             <html:ol liberator:highlight="HelpOrderedList">
@@ -137,24 +138,37 @@
                         <xsl:call-template name="toc">
                             <xsl:with-param name="level" select="$level + 1"/>
                             <xsl:with-param name="context" select="."/>
+                            <xsl:with-param name="toc" select="$toc"/>
                         </xsl:call-template>
                     </li>
                 </xsl:for-each>
             </html:ol>
         </xsl:if>
     </xsl:template>
-    <xsl:template match="liberator:h1" mode="pass-2">
-        <xsl:copy>
-            <xsl:apply-templates select="@*|node()"/>
-        </xsl:copy>
-        <xsl:if test="not($root//liberator:h1[2])">
-            <!-- Makes :help all impossibly slow. Why? -->
+    <xsl:template match="liberator:toc" mode="pass-2">
+        <xsl:variable name="TOC">
+            <context/>
+            <xsl:for-each
+                select="following::liberator:h1|following::liberator:h2|following::liberator:h3|following::liberator:h4|following::liberator:h5">
+                <xsl:copy-of select="."/>
+            </xsl:for-each>
+        </xsl:variable>
+        <xsl:variable name="toc" select="exsl:node-set($TOC)"/>
+
+        <xsl:if test="//liberator:toc[1 and self::*]">
             <html:div liberator:highlight="HelpTOC">
                 <h2>Contents</h2>
-                <xsl:call-template name="toc">
-                    <xsl:with-param name="level" select="2"/>
-                    <xsl:with-param name="context" select="."/>
-                </xsl:call-template>
+                <xsl:if test="@start">
+                    <xsl:call-template name="toc">
+                        <xsl:with-param name="level" select="number(@start)"/>
+                        <xsl:with-param name="toc" select="$toc"/>
+                    </xsl:call-template>
+                </xsl:if>
+                <xsl:if test="not(@start)">
+                    <xsl:call-template name="toc">
+                        <xsl:with-param name="toc" select="$toc"/>
+                    </xsl:call-template>
+                </xsl:if>
             </html:div>
         </xsl:if>
     </xsl:template>
diff --git a/common/locale/en-US/all.xml b/common/locale/en-US/all.xml
index 7f98d076..e6287999 100644
--- a/common/locale/en-US/all.xml
+++ b/common/locale/en-US/all.xml
@@ -10,6 +10,8 @@
     xmlns:html="http://www.w3.org/1999/xhtml">
 <tags>all</tags>
 
+<toc/>
+
 <include href="intro" tag="intro.html"/>
 <include href="starting" tag="starting.html"/>
 <include href="browsing" tag="browsing.html"/>
diff --git a/common/locale/en-US/autocommands.xml b/common/locale/en-US/autocommands.xml
index 263d2a9f..3a84542c 100644
--- a/common/locale/en-US/autocommands.xml
+++ b/common/locale/en-US/autocommands.xml
@@ -9,6 +9,7 @@
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1 tag="autocommands">Automatic commands</h1>
+<toc start="2"/>
 
 <p>
     Autocommands are a way to automatically execute code when
diff --git a/common/locale/en-US/browsing.xml b/common/locale/en-US/browsing.xml
index e9d4adc7..a2357679 100644
--- a/common/locale/en-US/browsing.xml
+++ b/common/locale/en-US/browsing.xml
@@ -9,6 +9,7 @@
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1 tag="surfing browsing">Browsing</h1>
+<toc start="2"/>
 
 &liberator.appname; overrides nearly all &liberator.host; keys in order to make browsing more
 pleasant for Vim users. On the rare occasions when you want to pass a keystroke
diff --git a/common/locale/en-US/buffer.xml b/common/locale/en-US/buffer.xml
index 1adc68ae..a0e96318 100644
--- a/common/locale/en-US/buffer.xml
+++ b/common/locale/en-US/buffer.xml
@@ -9,6 +9,7 @@
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1 tag="buffer document">Buffer</h1>
+<toc start="2"/>
 
 &liberator.appname; holds exactly one buffer object for each tab. It is usually an
 (X)HTML document with advanced features.
diff --git a/common/locale/en-US/cmdline.xml b/common/locale/en-US/cmdline.xml
index 88ef9559..f4223061 100644
--- a/common/locale/en-US/cmdline.xml
+++ b/common/locale/en-US/cmdline.xml
@@ -9,6 +9,7 @@
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1 tag="Command-line-mode Command-line mode-cmdline">Command-line mode</h1>
+<toc start="2"/>
 
 Command-line mode is used to enter Ex commands (<k>:</k>) and text search patterns
 (<k>/</k> and <k>?</k>).
diff --git a/common/locale/en-US/developer.xml b/common/locale/en-US/developer.xml
index 3f7d7e74..7119ce15 100644
--- a/common/locale/en-US/developer.xml
+++ b/common/locale/en-US/developer.xml
@@ -9,6 +9,7 @@
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1 tag="developer-information">Developer information</h1>
+<toc start="2"/>
 
 <h2 tag="writing-docs documentation">Writing documentation</h2>
 
diff --git a/common/locale/en-US/eval.xml b/common/locale/en-US/eval.xml
index abae9dbb..0b49eb68 100644
--- a/common/locale/en-US/eval.xml
+++ b/common/locale/en-US/eval.xml
@@ -9,6 +9,7 @@
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1 tag="expression expr eval">Expression evaluation</h1>
+<toc start="2"/>
 
 <!-- INTRO TO BE WRITTEN… -->
 
diff --git a/common/locale/en-US/gui.xml b/common/locale/en-US/gui.xml
index 39836f26..2250027a 100644
--- a/common/locale/en-US/gui.xml
+++ b/common/locale/en-US/gui.xml
@@ -9,6 +9,7 @@
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1 tag="gui">&liberator.appname;'s GUI</h1>
+<toc start="2"/>
 
 <p>
     Although &liberator.appname; offers the most frequently used &liberator.host; functionality via
diff --git a/common/locale/en-US/hints.xml b/common/locale/en-US/hints.xml
index 1cb5360e..b9439e0e 100644
--- a/common/locale/en-US/hints.xml
+++ b/common/locale/en-US/hints.xml
@@ -9,6 +9,7 @@
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1 tag="quick-hints hints">Hints</h1>
+<toc start="2"/>
 
 Hints are the way in which &liberator.appname; allows you to follow links on a page. By
 providing each link with a suitable hint, you can access all links with a
diff --git a/common/locale/en-US/index.xml b/common/locale/en-US/index.xml
index 7e6a4588..2482ad84 100644
--- a/common/locale/en-US/index.xml
+++ b/common/locale/en-US/index.xml
@@ -9,6 +9,7 @@
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1 tag="index">Index</h1>
+<toc start="2"/>
 
 This file contains a list of all available commands, mappings and options.
 
diff --git a/common/locale/en-US/insert.xml b/common/locale/en-US/insert.xml
index f8e5c658..262a49ed 100644
--- a/common/locale/en-US/insert.xml
+++ b/common/locale/en-US/insert.xml
@@ -9,6 +9,7 @@
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1 tag="Insert-mode Insert mode-insert">Insert mode</h1>
+<toc start="2"/>
 
 <p>
     Insert mode is used to enter text in text boxes and text areas. When
diff --git a/common/locale/en-US/map.xml b/common/locale/en-US/map.xml
index 79dab0f5..e613162a 100644
--- a/common/locale/en-US/map.xml
+++ b/common/locale/en-US/map.xml
@@ -9,6 +9,7 @@
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1>Key mappings, abbreviations, and user-defined commands</h1>
+<toc start="2"/>
 
 <h2 tag="key-mapping mapping map macro">Key mapping</h2>
 
diff --git a/common/locale/en-US/marks.xml b/common/locale/en-US/marks.xml
index 2b6f3995..c8617d44 100644
--- a/common/locale/en-US/marks.xml
+++ b/common/locale/en-US/marks.xml
@@ -9,6 +9,7 @@
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1 tag="different-marks marks">Marks</h1>
+<toc start="2"/>
 
 <p>
     &liberator.appname; supports a number of different marks:
@@ -22,6 +23,7 @@
 </ul>
 
 <h1 tag="bookmarks">Bookmarks</h1>
+<toc start="2"/>
 
 <item>
     <tags>a :bma :bmark</tags>
@@ -106,6 +108,7 @@
 </item>
 <!-- TODO: why is this duplicated in browsing? -->
 <h1 tag="history">History</h1>
+<toc start="2"/>
 
 <item>
     <tags><![CDATA[<C-o>]]></tags>
@@ -201,6 +204,7 @@
 </item>
 
 <h1 tag="quickmarks">QuickMarks</h1>
+<toc start="2"/>
 
 <item>
     <tags>go</tags>
@@ -288,6 +292,7 @@
     </description>
 </item>
 <h1 tag="localmarks">Local marks</h1>
+<toc start="2"/>
 
 <item>
     <tags>m</tags>
diff --git a/common/locale/en-US/message.xml b/common/locale/en-US/message.xml
index e4b134ef..86112cc0 100644
--- a/common/locale/en-US/message.xml
+++ b/common/locale/en-US/message.xml
@@ -9,6 +9,7 @@
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1 tag="messages">Error and informational messages</h1>
+<toc start="2"/>
 
 <tags>message-history</tags>
 
diff --git a/common/locale/en-US/options.xml b/common/locale/en-US/options.xml
index c76d62d8..12981a59 100644
--- a/common/locale/en-US/options.xml
+++ b/common/locale/en-US/options.xml
@@ -9,6 +9,7 @@
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1 tag="options">Options</h1>
+<toc start="2"/>
 
 <p>
     &liberator.appname; has a number of internal variables and switches which can be set to
diff --git a/common/locale/en-US/pattern.xml b/common/locale/en-US/pattern.xml
index 3d1277e6..036d8b1f 100644
--- a/common/locale/en-US/pattern.xml
+++ b/common/locale/en-US/pattern.xml
@@ -9,6 +9,7 @@
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1 tag="text-search-commands">Text search commands</h1>
+<toc start="2"/>
 
 <p>
     &liberator.appname; provides a Vim-like interface to &liberator.host;'s standard text search
diff --git a/common/locale/en-US/print.xml b/common/locale/en-US/print.xml
index 6e611abc..0e98332b 100644
--- a/common/locale/en-US/print.xml
+++ b/common/locale/en-US/print.xml
@@ -9,6 +9,7 @@
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1 tag="printing">Printing</h1>
+<toc start="2"/>
 
 <item>
     <tags>:ha :hardcopy</tags>
diff --git a/common/locale/en-US/repeat.xml b/common/locale/en-US/repeat.xml
index 212adf4a..0ef1069a 100644
--- a/common/locale/en-US/repeat.xml
+++ b/common/locale/en-US/repeat.xml
@@ -9,6 +9,7 @@
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1 tag="repeating">Repeating commands</h1>
+<toc start="2"/>
 
 <p>&liberator.appname; can repeat a number of commands and record macros.</p>
 
diff --git a/common/locale/en-US/starting.xml b/common/locale/en-US/starting.xml
index 14cead19..daf5b590 100644
--- a/common/locale/en-US/starting.xml
+++ b/common/locale/en-US/starting.xml
@@ -9,6 +9,7 @@
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1 tag="starting">Starting &liberator.appname;</h1>
+<toc start="2"/>
 
 <tags>startup-options</tags>
 
diff --git a/common/locale/en-US/styling.xml b/common/locale/en-US/styling.xml
index ef9db969..05959626 100644
--- a/common/locale/en-US/styling.xml
+++ b/common/locale/en-US/styling.xml
@@ -9,6 +9,7 @@
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1 tag="styling">Styling the GUI and web pages</h1>
+<toc start="2"/>
 
 <p>
     &liberator.appname; allows you to style both the browser and any web pages you view. All
diff --git a/common/locale/en-US/tabs.xml b/common/locale/en-US/tabs.xml
index 2013be75..5c0b06cd 100644
--- a/common/locale/en-US/tabs.xml
+++ b/common/locale/en-US/tabs.xml
@@ -9,6 +9,7 @@
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1 tag="tabs">Tabs</h1>
+<toc start="2"/>
 
 <p>
     Tabs are used to be able to view many web pages at the same time. Each tab
diff --git a/common/locale/en-US/various.xml b/common/locale/en-US/various.xml
index 79999f9d..9fc05efb 100644
--- a/common/locale/en-US/various.xml
+++ b/common/locale/en-US/various.xml
@@ -9,6 +9,7 @@
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1>Other help</h1>
+<toc start="2"/>
 
 <h2 tag="various">Various commands</h2>