diff --git a/eleventy.config.js b/eleventy.config.js
index d877bd46..7653a3f2 100644
--- a/eleventy.config.js
+++ b/eleventy.config.js
@@ -61,6 +61,14 @@ module.exports = function (eleventyConfig) {
     // Shortcode: <cite> tag
     eleventyConfig.addShortcode('cite', (str) => `<cite>${str}</cite>`);
 
+    // Paired shortcode: Manual heading anchor
+    eleventyConfig.addPairedShortcode('headingAnchor', (title, hLevel, id) => {
+        return `<div class="heading-wrapper h${hLevel}">
+            <h${hLevel} id="${id}">${title}</h2>
+            <a class="heading-anchor" href="#${id}" aria-labelledby="${id}"><span hidden="">#</span></a>
+        </div>`;
+    });
+
     return {
         dir: {
             input: "src"
diff --git a/src/_includes/main/changelogs-list.njk b/src/_includes/main/changelogs-list.njk
index b593b8ca..73da18d3 100644
--- a/src/_includes/main/changelogs-list.njk
+++ b/src/_includes/main/changelogs-list.njk
@@ -1,7 +1,7 @@
 {% for log in changelogList | reverse %}
-    <div class="heading-wrapper h2">
-        <h2 id="{{ log.fileSlug }}">{{ log.date | formatDate }}</h2>
-        <a class="heading-anchor" href="#{{ log.fileSlug }}" aria-labelledby="{{ log.fileSlug }}"><span hidden="">#</span></a>
-    </div>
+    {% headingAnchor 2, log.fileSlug %}
+        {{ log.date | formatDate }}
+    {% endheadingAnchor %}
+
     {{ log.templateContent | safe }}
 {%- endfor %}