diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0dfc6ee24..72aa86cb9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,13 @@
+# next-2.x
+- The clipboard integration has been revamped with explicit bindings. OS X clipboard support provided for out of the box in addition to X11. (#3061)
+
 # fish 2.3.1 (unreleased)
 
 ## Significant changes
-
-- The clipboard integration has been revamped with explicit bindings. OS X clipboard support provided for out of the box in addition to X11. (#3061)
 - The `key_reader` utility was renamed to `fish_key_reader` and is now built by default. (#2991)
 
 ## Other notable fixes and improvements
+- Paper over mayhem caused with missing `stirng` builtin while old versions of fish are still running moments after upgrading to fish 2.3 (#3057, #3065, #3125, #3141)
 - `fish_config` didn't work in fish.app (OS X) if one didn't already have fish installed by some other means. (#3140)
 - `type -a` now syntax-colorizes function source output.
 - Improvements to `suspend` (#3154),