diff --git a/python/changelog.d/+changelog-section-headings.chore.md b/python/changelog.d/+changelog-section-headings.chore.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/python/changelog.d/template.md.jinja b/python/changelog.d/template.md.jinja
index 028640876..468b78d15 100644
--- a/python/changelog.d/template.md.jinja
+++ b/python/changelog.d/template.md.jinja
@@ -3,12 +3,16 @@
 
 {% endif %}
 {% for category in ["breaking", "feat", "fix"] %}
-{% for text, values in sections[""].get(category, {}).items() %}
+{% if sections[""].get(category) %}
+### {{ definitions[category]["name"] }}
+
+{% for text, values in sections[""][category].items() %}
 {% set lines = text.strip().split("\n", 1) %}
 - {{ lines[0] }}{% if values %} ({{ values|join(", ") }}){% endif %}{{ "" }}
 {% if lines|length > 1 %}
 {{ lines[1] }}
 {% endif %}
 {% endfor %}
+
+{% endif %}
 {% endfor %}
-{{ "\n" }}