diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 14c231387..a5ad62a52 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,13 @@
 Changelog
 =========
 
+Version 0.5.4-beta
+==================
+
+- Bug fix: An infinite loop could occur if custom modules were declaring the same variable
+  several times with different units or default values.
+
+
 Version 0.5.3-beta
 ==================