diff --git a/CHANGES.md b/CHANGES.md
index 61fe94d..c4b704d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,13 @@
+2016-02-23, Version 2.17.0
+==========================
+
+ * executor: move "booted" and cb() to the next tick (Miroslav Bajtoš)
+
+ * Fix lodash 4.0.0 breaking changes (Jérémie Drouet)
+
+ * When config is overriden with null don't merge (Farid Neshat)
+
+
 2015-12-22, Version 2.16.0
 ==========================
 
@@ -314,8 +324,6 @@
 2014-07-17, Version v2.0.0-beta3
 ================================
 
- * v2.0.0-beta3 (Miroslav Bajtoš)
-
  * compiler: return a clone of instructions (Miroslav Bajtoš)
 
 
@@ -334,8 +342,6 @@
 2014-06-26, Version 2.0.0-beta1
 ===============================
 
- * 2.0.0-beta1 (Miroslav Bajtoš)
-
  * test: fix jshint warnings (Miroslav Bajtoš)
 
  * compiler: fix references to loopback (Miroslav Bajtoš)
diff --git a/package.json b/package.json
index e266210..fc56cba 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "loopback-boot",
-  "version": "2.16.0",
+  "version": "2.17.0",
   "description": "Convention-based bootstrapper for LoopBack applications",
   "keywords": [
     "StrongLoop",