diff --git a/CHANGELOG.md b/CHANGELOG.md
index 531137fa..fa357c1b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,13 @@
 
 **TBD (TBD):**
 
-**0.14.0 (2022-xx-xx):**
+**0.15.0 (2022-xx-xx):**
+
+**Changes**:
+
+- Fix a bug were the same IP could be assigned to multiple hosts if joined in quick succession [#346](https://github.com/juanfont/headscale/pull/346)
+
+**0.14.0 (2022-02-25):**
 
 **UPCOMING BREAKING**:
 From the **next** version (`0.15.0`), all machines will be able to communicate regardless of