diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1426f079..ebfd568e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
# novelWriter Changelog
+## Version 1.5.4 [2022-01-04]
+
+### Release Notes
+
+This is a bugfix release that fixes an issues with rendering HTML from a document, either in the
+viewer or the build tool, when there is a greater or lesser than symbol in a text block that isn't
+a plain text paragraph, like for instance a comment or a heading. Any such document would fail to
+render.
+
+### Detailed Changelog
+
+**Bugfixes**
+
+* Fixed a bug where a greater or lesser than symbol would crash the html converter loop if the text
+ block did not have a format with a 'NoneType is not iterable' error. Most blocks that are not
+ plain text have the format set to 'None'. Issue #950, PR #951.
+
+----
+
## Version 1.5.3 [2021-12-31]
### Release Notes
diff --git a/novelwriter/assets/text/release_notes.htm b/novelwriter/assets/text/release_notes.htm
index 238dbb0a..15fc6ee2 100644
--- a/novelwriter/assets/text/release_notes.htm
+++ b/novelwriter/assets/text/release_notes.htm
@@ -2,6 +2,18 @@
+Release Notes for 1.5.4
+Released on 4 January 2022
+
+This is a bugfix release that fixes an issues with rendering HTML from a document, either in
+the viewer or the build tool, when there is a greater or lesser than symbol in a text block that
+isn't a plain text paragraph, like for instance a comment or a heading. Any such document would
+fail to render.
+
+See also the Releases page.
+
+
+
Release Notes for 1.5.3
Released on 31 December 2021
@@ -11,8 +23,6 @@ changed to a scene item. The second fix changes how the Create Root Folder subme
of disabling the menu entries that are no longer available, they are instead removed. Disabled menu
entries are not displayed correctly in all colour themes.
-See also the Releases page.
-
Release Notes for 1.5.2