diff --git a/docs/changelog.rst b/docs/changelog.rst
index 71f6bbc95..ccf13930a 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,11 +1,11 @@
 Changelog
 =========
 
+Changelog goes here! Please add your entry to the bottom of one of the lists below!
+
 Unreleased
 ----------
 
-Changelog goes here! Please add your entry to the bottom of one of the lists below!
-
 New features:
 
 * New template function added: ``%capitalize``. Converts the first letter of
@@ -14,7 +14,7 @@ New features:
   `beet list -a title:something` or `beet list artpath:cover`. Consequently
   album queries involving `path` field have been sped up, like `beet list -a
   path:/path/`.
-* New `keep_in_artist` option for the :doc:`plugins/ftintitle` plugin, which
+* :doc:`plugins/ftintitle`: New `keep_in_artist` option for the plugin, which
   allows keeping the "feat." part in the artist metadata while still changing
   the title.
 * :doc:`plugins/autobpm`: Add new configuration option ``beat_track_kwargs``
diff --git a/extra/release.py b/extra/release.py
index 1e90eb97b..329fbb208 100755
--- a/extra/release.py
+++ b/extra/release.py
@@ -40,7 +40,10 @@ def update_changelog(text: str, new: Version) -> str:
 Unreleased
 ----------
 
-Changelog goes here! Please add your entry to the bottom of one of the lists below!
+New features:
+Bug fixes:
+For packagers:
+Other changes:
 
 {new_header}
 {'-' * len(new_header)}