diff --git a/do-release.sh b/do-release.sh
index 5417ffd455..d11a80298a 100755
--- a/do-release.sh
+++ b/do-release.sh
@@ -149,12 +149,7 @@ The PMD team is pleased to announce PMD {{ site.pmd.version }}.
 
 This is a {{ site.pmd.release_type }} release.
 
-### Table Of Contents
-
-* [New and noteworthy](#new-and-noteworthy)
-* [Fixed Issues](#fixed-issues)
-* [API Changes](#api-changes)
-* [External Contributions](#external-contributions)
+{% tocmaker %}
 
 ### New and noteworthy
 
@@ -164,6 +159,8 @@ This is a {{ site.pmd.release_type }} release.
 
 ### External Contributions
 
+{% endtocmaker %}
+
 EOF
 
 git commit -a -m "Prepare next development version"
diff --git a/docs/_plugins/tocmaker_block.rb b/docs/_plugins/tocmaker_block.rb
index e62ee49374..53b0eb28d9 100644
--- a/docs/_plugins/tocmaker_block.rb
+++ b/docs/_plugins/tocmaker_block.rb
@@ -48,4 +48,4 @@ class TocMakerBlock < Liquid::Block
 end
 
 
-Liquid::Template.register_tag('tocmaker', TocMakerBlock)
\ No newline at end of file
+Liquid::Template.register_tag('tocmaker', TocMakerBlock)
diff --git a/docs/pages/pmd/projectdocs/committers/releasing.md b/docs/pages/pmd/projectdocs/committers/releasing.md
index 5800289cac..34b5ac29aa 100644
--- a/docs/pages/pmd/projectdocs/committers/releasing.md
+++ b/docs/pages/pmd/projectdocs/committers/releasing.md
@@ -151,12 +151,7 @@ The PMD team is pleased to announce PMD {{ site.pmd.version }}.
 
 This is a {{ site.pmd.release_type }} release.
 
-### Table Of Contents
-
-* [New and noteworthy](#new-and-noteworthy)
-* [Fixed Issues](#fixed-issues)
-* [API Changes](#api-changes)
-* [External Contributions](#external-contributions)
+{% tocmaker %}
 
 ### New and noteworthy
 
@@ -166,6 +161,8 @@ This is a {{ site.pmd.release_type }} release.
 
 ### External Contributions
 
+{% endtocmaker %}
+
 ```
 {%endraw%}