diff --git a/release-it/changelog.hbs b/release-it/changelog.hbs
index 7f027ca..8e6bdf3 100644
--- a/release-it/changelog.hbs
+++ b/release-it/changelog.hbs
@@ -1,19 +1,41 @@
-### Changelog
+# Changelog
 
-All notable changes to "Neon Night" will be documented in this file. Dates are displayed in UTC.
+All notable changes to **Neon Night** will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and **Neon Night** adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 {{#each releases}}
-{{#if @first}}
+{{#if href}}
+## [{{title}}]({{href}}){{#if tag}} - {{isoDate}}{{/if}}
+{{else}}
+## {{title}}{{#if tag}} - {{isoDate}}{{/if}}
+{{/if}}
+
+{{#if summary}}
+{{summary}}
+{{/if}}
+
+{{#if merges}}
+### Merged
+
 {{#each merges}}
-- {{{message}}}{{#if href}} [`#{{id}}`]({{href}}){{/if}}
+- {{{message}}} {{#if href}}[`#{{id}}`]({{href}}){{/if}}
 {{/each}}
+{{/if}}
+
+{{#if fixes}}
+### Fixed
+
 {{#each fixes}}
-- {{{commit.subject}}}{{#each fixes}}{{#if href}} [`#{{id}}`]({{href}}){{/if}}{{/each}}
-{{/each}}
-{{#each commits}}
-- {{#if breaking}}**Breaking change:** {{/if}}{{{subject}}}{{#if href}} [`{{shorthash}}`]({{href}}){{/if}}
+- {{{commit.subject}}}{{#each fixes}} {{#if href}}[`#{{id}}`]({{href}}){{/if}}{{/each}}
 {{/each}}
 {{/if}}
+
+{{#commit-list commits heading='### Commits'}}
+- {{#if breaking}}**Breaking change:** {{/if}}{{{subject}}} {{#if href}}[`{{shorthash}}`]({{href}}){{/if}}
+{{/commit-list}}
+
 {{/each}}