diff --git a/CHANGES.md b/CHANGES.md
index 995362a4..258311b6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,9 @@
+2018-05-22, Version 3.21.0
+==========================
+
+ * Fix datasource state management (Raymond Feng)
+
+
 2018-05-11, Version 3.20.2
 ==========================
 
diff --git a/package.json b/package.json
index e57db21b..d48eed0d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "loopback-datasource-juggler",
-  "version": "3.20.2",
+  "version": "3.21.0",
   "publishConfig": {
     "export-tests": true
   },