diff --git a/map.mdwn b/map.mdwn
new file mode 100644
index 0000000000000000000000000000000000000000..658697679a5699a4bea84a6900bc25ddfbfdaddb
--- /dev/null
+++ b/map.mdwn
@@ -0,0 +1,3 @@
+[[!meta title="Sitemap"]]
+
+[[!map pages="page(*) and !ikiwiki/* and !index and !sandbox and !templates* and !smileys and !shortcuts and !ikiwiki and !RecentChanges and !*/Discussion" show="title"]]
diff --git a/templates/page.tmpl b/templates/page.tmpl
index b525d22118d5cd2a6e1367a85d80684e7e97b281..01a1aad30825d24f9f81e3bf5c0fc7eec17f3424 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -52,6 +52,7 @@
       </TMPL_LOOP>
       <li><TMPL_VAR TITLE></li>
       <li><span class="divider">|</span> <a href="/meta">Meta</a></li>
+      <li><span class="divider">|</span> <a href="/map">Map</a></li>
       <li><span class="divider">|</span> <a href="<TMPL_VAR HISTORYURL>">History</a></li>
       <li><span class="divider">|</span> <a href="/index.rss">Feed</a></li>
       </ul>