diff --git a/CHANGELOG.md b/CHANGELOG.md
index 455043e490..9250cbcce2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # ember-cli Changelog
 
+### 2.6.3
+
+The following changes are required if you are upgrading from the previous
+version:
+
+- Users
+  + Upgrade your project's ember-cli version - [docs](http://ember-cli.com/user-guide/#upgrading)
+- Addon Developers
+  + [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v2.6.2...v2.6.3)
+  + Upgrade your project's ember-cli version - [docs](http://ember-cli.com/user-guide/#upgrading)
+- Core Contributors
+  + No changes required
+
+#### Community Contributions
+
+- [#6068](https://github.com/ember-cli/ember-cli/pull/6068) Allow more then 10 exit handlers [@nathanhammond](https://github.com/nathanhammond)
+
+Thank you to all who took the time to contribute!
+
 ### 2.6.2
 
 The following changes are required if you are upgrading from the previous
diff --git a/package.json b/package.json
index f7c560449d..faa04ff89e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "2.6.2",
+  "version": "2.6.3",
   "main": "lib/cli/index.js",
   "description": "Command line tool for developing ambitious ember.js apps",
   "trackingCode": "UA-49225444-1",