diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a40065d7..708d81b4d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# fish 2.4.0 (released ???)
+
+There are no major changes between 2.4b1 and 2.4.0.
+
+## Notable fixes and improvements
+- The documentation is now generated properly and with the correct version identifier.
+- Automatic cursor changes are now only enabled on the subset of XTerm versions known to support them, resolving a problem where older versions printed garbage to the terminal before and after every prompt (#3499).
+- Added completions for `defaults` and improved completions for `diskutil` (#3478).
+
 # fish 2.4b1 (released October 18, 2016)
 
 ## Significant changes