diff --git a/Shake.hs b/Shake.hs
index 6736f8ae2..672b1fa4c 100755
--- a/Shake.hs
+++ b/Shake.hs
@@ -267,7 +267,7 @@ main = do
 
     webmanall %> \out -> do
       need webmanpages
-      liftIO $ writeFile webmanall "* toc\n\n" -- # Big Manual\n\n -- TOC style is better without main heading,
+      liftIO $ writeFile webmanall "\\$toc\\$" -- # Big Manual\n\n -- TOC style is better without main heading,
       forM_ webmanpages $ \f -> do -- site/hledger.md, site/journal.md
         cmd Shell ("printf '\\n\\n' >>") webmanall :: Action ExitCode
         cmd Shell "pandoc" f "-t markdown-fenced_divs --atx-headers"
diff --git a/doc/lib.m4 b/doc/lib.m4
index ac7602a41..66405f7e7 100644
--- a/doc/lib.m4
+++ b/doc/lib.m4
@@ -31,7 +31,7 @@ m4_dnl | <a href="/doc/0.27/manual.html#$1">0.27</a>
 </span>)m4_dnl
 m4_dnl
 m4_define({{_toc_}},{{
-* toc
+\$toc\$
 }})m4_dnl
 m4_dnl
 m4_dnl _table_({{
diff --git a/doc/manpage.html b/doc/manpage.html
index 734bc4eb5..fc0909cf5 100644
--- a/doc/manpage.html
+++ b/doc/manpage.html
@@ -10,7 +10,7 @@ $include-before$
 $endfor$
 -->
 
-<!-- * toc -->
+<!-- $toc$ -->
 
 $body$
 
diff --git a/site/doc/0.27/manual.md b/site/doc/0.27/manual.md
index b191e1150..e1cc294e5 100644
--- a/site/doc/0.27/manual.md
+++ b/site/doc/0.27/manual.md
@@ -1,4 +1,4 @@
-* toc
+\$toc\$
 
 
 
diff --git a/site/doc/1.0/csv.md b/site/doc/1.0/csv.md
index 6e595c1db..d10767653 100644
--- a/site/doc/1.0/csv.md
+++ b/site/doc/1.0/csv.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.0**. <span class="docversions"></span>
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.0/hledger-api.md b/site/doc/1.0/hledger-api.md
index 615580616..200e0d332 100644
--- a/site/doc/1.0/hledger-api.md
+++ b/site/doc/1.0/hledger-api.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.0**. <span class="docversions"></span>
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.0/hledger-ui.md b/site/doc/1.0/hledger-ui.md
index d65a38808..27ef5a7a9 100644
--- a/site/doc/1.0/hledger-ui.md
+++ b/site/doc/1.0/hledger-ui.md
@@ -2,20 +2,7 @@
 
 This doc is for version **1.0**. <span class="docversions"></span>
 
--   toc
-    <style>
-    .highslide img {max-width:250px; float:right; margin:0 0 1em 1em;}
-    .highslide-caption {color:white; background-color:black;}
-    </style>
-    <a href="images/hledger-ui/hledger-ui-sample-acc2.png" class="highslide" onclick="return hs.expand(this)"><img src="images/hledger-ui/hledger-ui-sample-acc2.png" title="Accounts screen with query and depth limit" /></a>
-    <a href="images/hledger-ui/hledger-ui-sample-acc.png" class="highslide" onclick="return hs.expand(this)"><img src="images/hledger-ui/hledger-ui-sample-acc.png" title="Accounts screen" /></a>
-    <a href="images/hledger-ui/hledger-ui-sample-acc-greenterm.png" class="highslide" onclick="return hs.expand(this)"><img src="images/hledger-ui/hledger-ui-sample-acc-greenterm.png" title="Accounts screen with greenterm theme" /></a>
-    <a href="images/hledger-ui/hledger-ui-sample-txn.png" class="highslide" onclick="return hs.expand(this)"><img src="images/hledger-ui/hledger-ui-sample-txn.png" title="Transaction screen" /></a>
-    <a href="images/hledger-ui/hledger-ui-sample-reg.png" class="highslide" onclick="return hs.expand(this)"><img src="images/hledger-ui/hledger-ui-sample-reg.png" title="Register screen" /></a>
-    <!-- <br clear=all> -->
-    <a href="images/hledger-ui/hledger-ui-bcexample-acc.png" class="highslide" onclick="return hs.expand(this)"><img src="images/hledger-ui/hledger-ui-bcexample-acc.png" title="beancount example accounts" /></a>
-    <a href="images/hledger-ui/hledger-ui-bcexample-acc-etrade-cash.png" class="highslide" onclick="return hs.expand(this)"><img src="images/hledger-ui/hledger-ui-bcexample-acc-etrade-cash.png" title="beancount example's etrade cash subaccount" /></a>
-    <a href="images/hledger-ui/hledger-ui-bcexample-acc-etrade.png" class="highslide" onclick="return hs.expand(this)"><img src="images/hledger-ui/hledger-ui-bcexample-acc-etrade.png" title="beancount example's etrade investments, all commoditiess" /></a>
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.0/hledger-web.md b/site/doc/1.0/hledger-web.md
index b3abddd3c..5540c9735 100644
--- a/site/doc/1.0/hledger-web.md
+++ b/site/doc/1.0/hledger-web.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.0**. <span class="docversions"></span>
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.0/hledger.md b/site/doc/1.0/hledger.md
index 9368666f4..d4fc64a61 100644
--- a/site/doc/1.0/hledger.md
+++ b/site/doc/1.0/hledger.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.0**. <span class="docversions"></span>
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.0/journal.md b/site/doc/1.0/journal.md
index d0271e4a3..505334672 100644
--- a/site/doc/1.0/journal.md
+++ b/site/doc/1.0/journal.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.0**. <span class="docversions"></span>
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.0/manual.md b/site/doc/1.0/manual.md
index 89f628221..514ee2097 100644
--- a/site/doc/1.0/manual.md
+++ b/site/doc/1.0/manual.md
@@ -1,4 +1,4 @@
-* toc
+\$toc\$
 
 
 
diff --git a/site/doc/1.0/timeclock.md b/site/doc/1.0/timeclock.md
index e8e2226ff..a9e79aece 100644
--- a/site/doc/1.0/timeclock.md
+++ b/site/doc/1.0/timeclock.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.0**. <span class="docversions"></span>
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.0/timedot.md b/site/doc/1.0/timedot.md
index ad42c0806..edbb04871 100644
--- a/site/doc/1.0/timedot.md
+++ b/site/doc/1.0/timedot.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.0**. <span class="docversions"></span>
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.1/csv.md b/site/doc/1.1/csv.md
index f452b21df..8d01307d5 100644
--- a/site/doc/1.1/csv.md
+++ b/site/doc/1.1/csv.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.1**. <span class="docversions"></span>
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.1/hledger-api.md b/site/doc/1.1/hledger-api.md
index 7f8e4b788..4a3452155 100644
--- a/site/doc/1.1/hledger-api.md
+++ b/site/doc/1.1/hledger-api.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.1**. <span class="docversions"></span>
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.1/hledger-ui.md b/site/doc/1.1/hledger-ui.md
index f1428fe07..6c0073457 100644
--- a/site/doc/1.1/hledger-ui.md
+++ b/site/doc/1.1/hledger-ui.md
@@ -2,20 +2,7 @@
 
 This doc is for version **1.1**. <span class="docversions"></span>
 
--   toc
-    <style>
-    .highslide img {max-width:250px; float:right; margin:0 0 1em 1em;}
-    .highslide-caption {color:white; background-color:black;}
-    </style>
-    <a href="images/hledger-ui/hledger-ui-sample-acc2.png" class="highslide" onclick="return hs.expand(this)"><img src="images/hledger-ui/hledger-ui-sample-acc2.png" title="Accounts screen with query and depth limit" /></a>
-    <a href="images/hledger-ui/hledger-ui-sample-acc.png" class="highslide" onclick="return hs.expand(this)"><img src="images/hledger-ui/hledger-ui-sample-acc.png" title="Accounts screen" /></a>
-    <a href="images/hledger-ui/hledger-ui-sample-acc-greenterm.png" class="highslide" onclick="return hs.expand(this)"><img src="images/hledger-ui/hledger-ui-sample-acc-greenterm.png" title="Accounts screen with greenterm theme" /></a>
-    <a href="images/hledger-ui/hledger-ui-sample-txn.png" class="highslide" onclick="return hs.expand(this)"><img src="images/hledger-ui/hledger-ui-sample-txn.png" title="Transaction screen" /></a>
-    <a href="images/hledger-ui/hledger-ui-sample-reg.png" class="highslide" onclick="return hs.expand(this)"><img src="images/hledger-ui/hledger-ui-sample-reg.png" title="Register screen" /></a>
-    <!-- <br clear=all> -->
-    <a href="images/hledger-ui/hledger-ui-bcexample-acc.png" class="highslide" onclick="return hs.expand(this)"><img src="images/hledger-ui/hledger-ui-bcexample-acc.png" title="beancount example accounts" /></a>
-    <a href="images/hledger-ui/hledger-ui-bcexample-acc-etrade-cash.png" class="highslide" onclick="return hs.expand(this)"><img src="images/hledger-ui/hledger-ui-bcexample-acc-etrade-cash.png" title="beancount example's etrade cash subaccount" /></a>
-    <a href="images/hledger-ui/hledger-ui-bcexample-acc-etrade.png" class="highslide" onclick="return hs.expand(this)"><img src="images/hledger-ui/hledger-ui-bcexample-acc-etrade.png" title="beancount example's etrade investments, all commoditiess" /></a>
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.1/hledger-web.md b/site/doc/1.1/hledger-web.md
index 7c11e065e..c071e5d96 100644
--- a/site/doc/1.1/hledger-web.md
+++ b/site/doc/1.1/hledger-web.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.1**. <span class="docversions"></span>
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.1/hledger.md b/site/doc/1.1/hledger.md
index 5672b5dc2..2d4f2ffc8 100644
--- a/site/doc/1.1/hledger.md
+++ b/site/doc/1.1/hledger.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.1**. <span class="docversions"></span>
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.1/journal.md b/site/doc/1.1/journal.md
index d828e7004..73813d8d6 100644
--- a/site/doc/1.1/journal.md
+++ b/site/doc/1.1/journal.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.1**. <span class="docversions"></span>
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.1/manual.md b/site/doc/1.1/manual.md
index 165ad1bb0..0a3b08e00 100644
--- a/site/doc/1.1/manual.md
+++ b/site/doc/1.1/manual.md
@@ -1,4 +1,4 @@
-* toc
+\$toc\$
 
 
 
diff --git a/site/doc/1.1/timeclock.md b/site/doc/1.1/timeclock.md
index 8a625816b..5d13a3f3a 100644
--- a/site/doc/1.1/timeclock.md
+++ b/site/doc/1.1/timeclock.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.1**. <span class="docversions"></span>
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.1/timedot.md b/site/doc/1.1/timedot.md
index 5e3cf7db6..616ab1d69 100644
--- a/site/doc/1.1/timedot.md
+++ b/site/doc/1.1/timedot.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.1**. <span class="docversions"></span>
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.2/csv.md b/site/doc/1.2/csv.md
index ea445efff..a5b878154 100644
--- a/site/doc/1.2/csv.md
+++ b/site/doc/1.2/csv.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.2**. []{.docversions}
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.2/hledger-api.md b/site/doc/1.2/hledger-api.md
index 44cc14b2a..f0929f31d 100644
--- a/site/doc/1.2/hledger-api.md
+++ b/site/doc/1.2/hledger-api.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.2**. []{.docversions}
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.2/hledger-ui.md b/site/doc/1.2/hledger-ui.md
index c6f1adf96..800a1f383 100644
--- a/site/doc/1.2/hledger-ui.md
+++ b/site/doc/1.2/hledger-ui.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.2**. []{.docversions}
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.2/hledger-web.md b/site/doc/1.2/hledger-web.md
index ace461206..bfa221e33 100644
--- a/site/doc/1.2/hledger-web.md
+++ b/site/doc/1.2/hledger-web.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.2**. []{.docversions}
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.2/hledger.md b/site/doc/1.2/hledger.md
index 94cb35294..f0ba3f9c0 100644
--- a/site/doc/1.2/hledger.md
+++ b/site/doc/1.2/hledger.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.2**. []{.docversions}
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.2/journal.md b/site/doc/1.2/journal.md
index dd85bc5d9..5a167737f 100644
--- a/site/doc/1.2/journal.md
+++ b/site/doc/1.2/journal.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.2**. []{.docversions}
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.2/manual.md b/site/doc/1.2/manual.md
index a78c9d204..053fb642e 100644
--- a/site/doc/1.2/manual.md
+++ b/site/doc/1.2/manual.md
@@ -1,4 +1,4 @@
-* toc
+\$toc\$
 
 
 
diff --git a/site/doc/1.2/timeclock.md b/site/doc/1.2/timeclock.md
index 84ea64dde..ce7a1d6da 100644
--- a/site/doc/1.2/timeclock.md
+++ b/site/doc/1.2/timeclock.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.2**. []{.docversions}
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.2/timedot.md b/site/doc/1.2/timedot.md
index 677a740a7..e4210c9a8 100644
--- a/site/doc/1.2/timedot.md
+++ b/site/doc/1.2/timedot.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.2**. []{.docversions}
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.3/csv.md b/site/doc/1.3/csv.md
index a3d3d76c6..abea816f3 100644
--- a/site/doc/1.3/csv.md
+++ b/site/doc/1.3/csv.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.3**. []{.docversions}
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.3/hledger-api.md b/site/doc/1.3/hledger-api.md
index bea2bdd69..ff3ca3229 100644
--- a/site/doc/1.3/hledger-api.md
+++ b/site/doc/1.3/hledger-api.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.3**. []{.docversions}
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.3/hledger-ui.md b/site/doc/1.3/hledger-ui.md
index e42995c07..3399cd523 100644
--- a/site/doc/1.3/hledger-ui.md
+++ b/site/doc/1.3/hledger-ui.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.3**. []{.docversions}
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.3/hledger-web.md b/site/doc/1.3/hledger-web.md
index f24be1dfa..bf37689a8 100644
--- a/site/doc/1.3/hledger-web.md
+++ b/site/doc/1.3/hledger-web.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.3**. []{.docversions}
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.3/hledger.md b/site/doc/1.3/hledger.md
index d2265be27..380fd82ad 100644
--- a/site/doc/1.3/hledger.md
+++ b/site/doc/1.3/hledger.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.3**. []{.docversions}
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.3/journal.md b/site/doc/1.3/journal.md
index 9b8c23c64..ae5b12f41 100644
--- a/site/doc/1.3/journal.md
+++ b/site/doc/1.3/journal.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.3**. []{.docversions}
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.3/manual.md b/site/doc/1.3/manual.md
index 238843e39..ea008d26f 100644
--- a/site/doc/1.3/manual.md
+++ b/site/doc/1.3/manual.md
@@ -1,4 +1,4 @@
-* toc
+\$toc\$
 
 
 
diff --git a/site/doc/1.3/timeclock.md b/site/doc/1.3/timeclock.md
index 7aaafce44..52a3b7010 100644
--- a/site/doc/1.3/timeclock.md
+++ b/site/doc/1.3/timeclock.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.3**. []{.docversions}
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.3/timedot.md b/site/doc/1.3/timedot.md
index 248e9d226..a7fb5dd90 100644
--- a/site/doc/1.3/timedot.md
+++ b/site/doc/1.3/timedot.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.3**. []{.docversions}
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.4/csv.md b/site/doc/1.4/csv.md
index 068cf9c5e..bf2d1bbcd 100644
--- a/site/doc/1.4/csv.md
+++ b/site/doc/1.4/csv.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.4**. <span class="docversions"></span>
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.4/hledger-api.md b/site/doc/1.4/hledger-api.md
index e0d87227f..661a65b99 100644
--- a/site/doc/1.4/hledger-api.md
+++ b/site/doc/1.4/hledger-api.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.4**. <span class="docversions"></span>
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.4/hledger-ui.md b/site/doc/1.4/hledger-ui.md
index f38bff12f..09cda91a7 100644
--- a/site/doc/1.4/hledger-ui.md
+++ b/site/doc/1.4/hledger-ui.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.4**. <span class="docversions"></span>
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.4/hledger-web.md b/site/doc/1.4/hledger-web.md
index 7b3cb0731..0d06ac105 100644
--- a/site/doc/1.4/hledger-web.md
+++ b/site/doc/1.4/hledger-web.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.4**. <span class="docversions"></span>
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.4/hledger.md b/site/doc/1.4/hledger.md
index a279501de..65d45305f 100644
--- a/site/doc/1.4/hledger.md
+++ b/site/doc/1.4/hledger.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.4**. <span class="docversions"></span>
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.4/journal.md b/site/doc/1.4/journal.md
index cefba19f4..285a56d11 100644
--- a/site/doc/1.4/journal.md
+++ b/site/doc/1.4/journal.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.4**. <span class="docversions"></span>
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.4/manual.md b/site/doc/1.4/manual.md
index 5f4826248..cd433535d 100644
--- a/site/doc/1.4/manual.md
+++ b/site/doc/1.4/manual.md
@@ -1,4 +1,4 @@
-* toc
+\$toc\$
 
 
 
diff --git a/site/doc/1.4/timeclock.md b/site/doc/1.4/timeclock.md
index 82645e5f8..bde69e3b4 100644
--- a/site/doc/1.4/timeclock.md
+++ b/site/doc/1.4/timeclock.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.4**. <span class="docversions"></span>
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.4/timedot.md b/site/doc/1.4/timedot.md
index 802ca7c1d..c238c061b 100644
--- a/site/doc/1.4/timedot.md
+++ b/site/doc/1.4/timedot.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.4**. <span class="docversions"></span>
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.5/csv.md b/site/doc/1.5/csv.md
index 93b99a675..c24dc9832 100644
--- a/site/doc/1.5/csv.md
+++ b/site/doc/1.5/csv.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.5**. []{.docversions}
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.5/hledger-api.md b/site/doc/1.5/hledger-api.md
index fcaf495b9..37418b1c1 100644
--- a/site/doc/1.5/hledger-api.md
+++ b/site/doc/1.5/hledger-api.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.5**. []{.docversions}
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.5/hledger-ui.md b/site/doc/1.5/hledger-ui.md
index 4ba518dd7..ee60386e8 100644
--- a/site/doc/1.5/hledger-ui.md
+++ b/site/doc/1.5/hledger-ui.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.5**. []{.docversions}
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.5/hledger-web.md b/site/doc/1.5/hledger-web.md
index 323b92421..909108e20 100644
--- a/site/doc/1.5/hledger-web.md
+++ b/site/doc/1.5/hledger-web.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.5**. []{.docversions}
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.5/hledger.md b/site/doc/1.5/hledger.md
index cfa4249f5..5a01bd957 100644
--- a/site/doc/1.5/hledger.md
+++ b/site/doc/1.5/hledger.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.5**. []{.docversions}
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.5/journal.md b/site/doc/1.5/journal.md
index 38e93e276..f223c84f0 100644
--- a/site/doc/1.5/journal.md
+++ b/site/doc/1.5/journal.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.5**. []{.docversions}
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.5/manual.md b/site/doc/1.5/manual.md
index 85e6a8277..d10a16999 100644
--- a/site/doc/1.5/manual.md
+++ b/site/doc/1.5/manual.md
@@ -1,4 +1,4 @@
-* toc
+\$toc\$
 
 
 
diff --git a/site/doc/1.5/timeclock.md b/site/doc/1.5/timeclock.md
index 4cda26fc3..589ada7b3 100644
--- a/site/doc/1.5/timeclock.md
+++ b/site/doc/1.5/timeclock.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.5**. []{.docversions}
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.5/timedot.md b/site/doc/1.5/timedot.md
index 3192a6801..11a30b728 100644
--- a/site/doc/1.5/timedot.md
+++ b/site/doc/1.5/timedot.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.5**. []{.docversions}
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.9/csv.md b/site/doc/1.9/csv.md
index 7a93709f6..4fdb3e6a7 100644
--- a/site/doc/1.9/csv.md
+++ b/site/doc/1.9/csv.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.9 (dev)**. []{.docversions}
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.9/hledger-api.md b/site/doc/1.9/hledger-api.md
index b1d01fee6..4a5b93810 100644
--- a/site/doc/1.9/hledger-api.md
+++ b/site/doc/1.9/hledger-api.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.9 (dev)**. []{.docversions}
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.9/hledger-ui.md b/site/doc/1.9/hledger-ui.md
index dcb887542..c62acb0b0 100644
--- a/site/doc/1.9/hledger-ui.md
+++ b/site/doc/1.9/hledger-ui.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.9 (dev)**. []{.docversions}
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.9/hledger-web.md b/site/doc/1.9/hledger-web.md
index 44eba8714..e22426031 100644
--- a/site/doc/1.9/hledger-web.md
+++ b/site/doc/1.9/hledger-web.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.9 (dev)**. []{.docversions}
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.9/hledger.md b/site/doc/1.9/hledger.md
index b78fd47a8..22d7a0e5d 100644
--- a/site/doc/1.9/hledger.md
+++ b/site/doc/1.9/hledger.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.9 (dev)**. []{.docversions}
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.9/journal.md b/site/doc/1.9/journal.md
index 889295dd0..4a88ddfd3 100644
--- a/site/doc/1.9/journal.md
+++ b/site/doc/1.9/journal.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.9 (dev)**. []{.docversions}
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.9/manual.md b/site/doc/1.9/manual.md
index 2b38cd183..187b4f3ad 100644
--- a/site/doc/1.9/manual.md
+++ b/site/doc/1.9/manual.md
@@ -1,4 +1,4 @@
-* toc
+\$toc\$
 
 
 
diff --git a/site/doc/1.9/timeclock.md b/site/doc/1.9/timeclock.md
index 0e0f05503..4a7095d26 100644
--- a/site/doc/1.9/timeclock.md
+++ b/site/doc/1.9/timeclock.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.9 (dev)**. []{.docversions}
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/doc/1.9/timedot.md b/site/doc/1.9/timedot.md
index 0fd438c39..cca4f7ae8 100644
--- a/site/doc/1.9/timedot.md
+++ b/site/doc/1.9/timedot.md
@@ -2,7 +2,7 @@
 
 This doc is for version **1.9 (dev)**. []{.docversions}
 
--   toc
+\$toc\$
 
 ## NAME
 
diff --git a/site/download.md b/site/download.md
index ca29604b3..84b66219d 100644
--- a/site/download.md
+++ b/site/download.md
@@ -1,4 +1,4 @@
-- toc
+\$toc\$
 
 # Download
 
diff --git a/tools/pandoc-drop-toc.lua b/tools/pandoc-drop-toc.lua
index d2cbb8f47..48cd535a2 100644
--- a/tools/pandoc-drop-toc.lua
+++ b/tools/pandoc-drop-toc.lua
@@ -1,16 +1,6 @@
-function keepBi(bi)
-    if not (bi[1].t == "Plain")                             then return true end
-    if not (bi[1].content[1].t == "Str")                    then return true end
-    if not (string.find(bi[1].content[1].text, "toc") == 1) then return true end
-    return false
-end
-
-function BulletList(bl)
-    local newBl = { }
-    for i,bi in pairs(bl.content) do
-        if keepBi(bi)
-            then table.insert(newBl, bi)
-        end
-    end
-    return pandoc.BulletList(newBl)
+function Para(p)
+    if not  p.content[1]                  then return p end
+    if not (p.content[1].t    == "Str")   then return p end
+    if not (p.content[1].text == "$toc$") then return p end
+    return pandoc.Null()
 end
diff --git a/tools/pandoc-site.hs b/tools/pandoc-site.hs
index 7ceaf1aae..861328ec1 100644
--- a/tools/pandoc-site.hs
+++ b/tools/pandoc-site.hs
@@ -65,9 +65,8 @@ createTable alignment headers
        in RawBlock "html" (navBegin ++ "\n" ++ tocString ++ "\n" ++ navEnd)
 
 generateTOC :: Block -> Block -> Block
-generateTOC toc (BulletList (( (( Plain ((Str "toc"):_)):_)):_))
-                = toc
-generateTOC _ x = x
+generateTOC toc (Para [Str "$toc$"]) = toc
+generateTOC _   x                    = x
 
 tableOfContents :: TOCAlignment -> Pandoc -> Pandoc
 tableOfContents TOCOff ast = walk ignoreTOC ast