diff --git a/CHANGES.md b/CHANGES.md
index c4b704d..8e231b6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,11 @@
+2016-04-07, Version 2.18.0
+==========================
+
+ * Dynamic datasources.json from ENV and config.json (David Cheung)
+
+ * Use eslint with loopback config (Miroslav Bajtoš)
+
+
 2016-02-23, Version 2.17.0
 ==========================
 
diff --git a/package.json b/package.json
index bbc4711..0fc99e4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "loopback-boot",
-  "version": "2.17.0",
+  "version": "2.18.0",
   "description": "Convention-based bootstrapper for LoopBack applications",
   "keywords": [
     "StrongLoop",