diff --git a/layouts/_default/_markup/render-heading.html b/layouts/_default/_markup/render-heading.html
new file mode 100644
index 00000000..53c328a3
--- /dev/null
+++ b/layouts/_default/_markup/render-heading.html
@@ -0,0 +1,7 @@
+<!-- .Anchor will turn whitespace in header names to "-", but mediawiki uses "_". Attach a second id with "-" changed to "_" here to make both work. -->
+<span id="{{ replace (.Anchor | safeURL) "-" "_" }}">
+  <h{{ .Level }} id="{{ .Anchor | safeURL }}">
+    {{ .Text | safeHTML }}
+    <a class="anchor" href="#{{ .Anchor | safeURL }}">#</a>
+  </h{{ .Level }}>
+</span>