diff --git a/layouts/doc/single.html b/layouts/doc/single.html
index c364fd0..5e3a519 100644
--- a/layouts/doc/single.html
+++ b/layouts/doc/single.html
@@ -8,7 +8,7 @@
 		</div>
 		<div class="column is-three-quarters">
 			<div class="content">
-				{{ .Content }}
+				{{ partial "headline-hash.html" .Content }}
 			</div>
 		</div>
 	</div>
diff --git a/layouts/page/single.html b/layouts/page/single.html
index a94aa77..4af3235 100644
--- a/layouts/page/single.html
+++ b/layouts/page/single.html
@@ -3,7 +3,7 @@
 
 <div class="container is-centered page">
 	<div class="content">
-		{{ .Content }}
+		{{ partial "headline-hash.html" .Content }}
 	</div>
 </div>
 
diff --git a/layouts/partials/headline-hash.html b/layouts/partials/headline-hash.html
new file mode 100644
index 0000000..05aadf6
--- /dev/null
+++ b/layouts/partials/headline-hash.html
@@ -0,0 +1 @@
+{{ . | replaceRE "(<h[1-9] id=\"([^\"]+)\".+)(</h[1-9]+>)" "${1}&nbsp;<a class=\"headline-hash\" href=\"#${2}\">#</a> ${3}" | safeHTML }}
diff --git a/layouts/post/single.html b/layouts/post/single.html
index d45f47c..632628c 100644
--- a/layouts/post/single.html
+++ b/layouts/post/single.html
@@ -13,7 +13,7 @@
 			{{ i18n "authored_by" }}
 			<b>{{ .Params.author | default .Site.Params.author }}</b>
 		</p>
-		{{ .Content }}
+		{{ partial "headline-hash.html" .Content }}
 	</div>
 </div>