diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index acc3d3aff..ccb830b23 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -94,6 +94,20 @@ Build::
   * core: fix build error if CMake option ENABLE_NLS is turned to off or if required dependencies are not found (issue #2026)
   * core, logger, relay: make zstd dependency optional (issue #2024)
 
+[[v4.0.6]]
+== Version 4.0.6 (2023-10-26)
+
+Bug fixes::
+
+  * core: fix crash when a custom bar item name is already used by a default bar item (issue #2034)
+  * core: fix generation of TOTP on Big Endian systems (issue #2021)
+  * irc: move value `-all` at the end of completions for command `/ignore del`
+  * irc: fix memory leak when joining channels with keys
+
+Build::
+
+  * core: fix build error if CMake option ENABLE_NLS is turned to off or if required dependencies are not found (issue #2026, issue #2031)
+
 [[v4.0.5]]
 == Version 4.0.5 (2023-09-24)
 
diff --git a/ReleaseNotes.adoc b/ReleaseNotes.adoc
index 7e256dad8..1b4334b6b 100644
--- a/ReleaseNotes.adoc
+++ b/ReleaseNotes.adoc
@@ -140,6 +140,19 @@ You can reset it with this command:
 /reset weechat.key_mouse.@chat(fset.fset):button1
 ----
 
+[[v4.0.6]]
+== Version 4.0.6 (2023-10-26)
+
+[[v4.0.6_custom_bar_items]]
+=== Custom bar items
+
+Custom bar items must now have a different name than default bar items
+(for example the custom bar item name `time` is now forbidden).
+
+If you have such names in your config, WeeChat will now fail to load them
+(this should not happen anyway, since such bar items can not be properly used
+and can cause a crash of WeeChat).
+
 [[v4.0.5]]
 == Version 4.0.5 (2023-09-24)