diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e56b963c..59e721546 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,20 @@
-# next-2.x
+# fish next-2.x (released ???)
+
+---
+
+# fish 2.4.0 (released November 8, 2016)
+
+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).
+- Improved the title set in Apple Terminal.app.
+- Added completions for `defaults` and improved completions for `diskutil` (#3478).
+
+---
+
+# fish 2.4b1 (released October 18, 2016)
 
 ## Significant changes
 - The clipboard integration has been revamped with explicit bindings. The killring commands no longer copy from, or paste to, the X11 clipboard - use the new copy (`C-x`) and paste (`C-v`) bindings instead. The clipboard is now available on OS X as well as systems using X11 (e.g. Linux). (#3061)
@@ -37,7 +53,7 @@
   -  `p4`, the Perforce client (#3314)
   -  `pygmentize` (#3378)
   -  `ranger` (#3378)
-- Improved completions for `aura` (#3297), `abbr` (#3267), `brew` (#3309), `chown` (#3380, #3383),`cygport` (#3392), `git` (#3274, #3226, #3225, #3094, #3087, #3035, #3021, #2982, #3230), `kill & `pkill` (#3200) `screen` (#3271), and `xz` (#3378).
+- Improved completions for `aura` (#3297), `abbr` (#3267), `brew` (#3309), `chown` (#3380, #3383),`cygport` (#3392), `git` (#3274, #3226, #3225, #3094, #3087, #3035, #3021, #2982, #3230), `kill & `pkill` (#3200), `screen` (#3271), `wget` (#3470), and `xz` (#3378).
 - Distributors, packagers and developers will notice that the build process produces more succinct output by default; use `make V=1` to get verbose output (#3248).
 - Improved compatibility with minor platforms including musl (#2988), Cygwin (#2993), Android (#3441, #3442), Haiku (#3322) and Solaris .
 
diff --git a/osx/Info.plist b/osx/Info.plist
index dbbcc6398..8d703c2bc 100644
--- a/osx/Info.plist
+++ b/osx/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.3.500</string>
+	<string>2.4.500</string>
 	<key>CFBundleVersion</key>
 	<string>0.1</string>
 	<key>LSApplicationCategoryType</key>
diff --git a/osx/config.h b/osx/config.h
index f273f679f..931328797 100644
--- a/osx/config.h
+++ b/osx/config.h
@@ -167,7 +167,7 @@
 #define PACKAGE_NAME "fish"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "fish 2.3.1-git"
+#define PACKAGE_STRING "fish 2.4.0-git"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "fish"
@@ -176,7 +176,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.3.1-git"
+#define PACKAGE_VERSION "2.4.0-git"
 
 /* The size of `wchar_t', as computed by sizeof. */
 #define SIZEOF_WCHAR_T 4