diff --git a/Makefile b/Makefile
index 4e118f1..f3d5c9c 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,7 @@ MKPAGE = $(PANDOC) --toc --standalone \
 	--lua-filter=tools/nowrap.lua \
 	--lua-filter=tools/extension-support.lua \
 	--lua-filter=tools/include-code-files.lua \
+	--lua-filter=tools/interlink.lua \
 	--variable time=${TIME} \
 	--css=css/site.css
 VERSION = $(shell pandoc --version | head -1 | awk '{print $$2}')
@@ -88,7 +89,7 @@ $(SITE)/%.svgz: $(SITE)/%.svg
 	mv $<.gz $@
 
 # 'make update' pulls in source files from the pandoc source directory
-SOURCES = $(patsubst %, $(PANDOC_SRC)/%, changelog.md MANUAL.txt INSTALL.md CONTRIBUTING.md doc/filters.md doc/pandoc-server.md doc/org.md doc/faqs.md doc/custom-readers.md doc/custom-writers.md doc/lua-filters.md doc/jats.md doc/using-the-pandoc-api.md doc/getting-started.md doc/epub.md doc/typst-property-output.md doc/press.md doc/extras.md) $(PANDOC_SRC)/pandoc-cli/man/pandoc.1 $(PANDOC_SRC)/data/creole.lua
+SOURCES = $(patsubst %, $(PANDOC_SRC)/%, changelog.md MANUAL.txt INSTALL.md CONTRIBUTING.md doc/filters.md doc/pandoc-server.md doc/org.md doc/faqs.md doc/custom-readers.md doc/custom-writers.md doc/lua-filters.md doc/jats.md doc/using-the-pandoc-api.md doc/getting-started.md doc/epub.md doc/typst-property-output.md doc/press.md doc/extras.md doc/templates.md) $(PANDOC_SRC)/pandoc-cli/man/pandoc.1 $(PANDOC_SRC)/data/creole.lua
 
 update :
 	cp $(SOURCES) .
diff --git a/template.html b/template.html
index 3991db3..e4a4c41 100644
--- a/template.html
+++ b/template.html
@@ -57,6 +57,7 @@
           <li class="nav-item"><a class="dropdown-item" href="CONTRIBUTING.html">Contributing</a></li>
           <li class="nav-item"><a class="dropdown-item" href="faqs.html">FAQ</a></li>
           <li class="nav-item"><a class="dropdown-item" href="press.html">Press</a></li>
+          <li class="nav-item"><a class="dropdown-item" href="templates.html">Templates</a></li>
           <li class="nav-item"><a class="dropdown-item" href="filters.html">Filters</a></li>
           <li class="nav-item"><a class="dropdown-item" href="lua-filters.html">Lua filters</a></li>
           <li class="nav-item"><a class="dropdown-item" href="custom-readers.html">Custom readers</a></li>
diff --git a/tools/interlink.lua b/tools/interlink.lua
new file mode 100644
index 0000000..8521c89
--- /dev/null
+++ b/tools/interlink.lua
@@ -0,0 +1,6 @@
+function Link(el)
+    if string.find(el.target, "%.md$") then
+        el.target = el.target:gsub("%.md$", ".html")
+        return el
+    end
+end