diff --git a/bower.json b/bower.json
index 13a797b6e..92b4fe793 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "bluebird",
-  "version": "3.5.5",
+  "version": "3.6.0",
   "homepage": "https://github.com/petkaantonov/bluebird",
   "authors": [
     "Petka Antonov <petka_antonov@hotmail.com>"
diff --git a/docs/_config.yml b/docs/_config.yml
index cf5b05a21..59c9116f8 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -19,7 +19,7 @@ markdown: redcarpet
 redcarpet:
   extensions:
     - fenced_code_blocks
-version: 3.5.5
+version: 3.6.0
 gems:
   - jekyll-redirect-from
 destination: ../gh-pages/
diff --git a/docs/docs/changelog.md b/docs/docs/changelog.md
index 60721ee91..67374aca3 100644
--- a/docs/docs/changelog.md
+++ b/docs/docs/changelog.md
@@ -3,6 +3,24 @@ id: changelog
 title: Changelog
 ---
 
+## 3.6.0 (2019-10-01)
+
+Features:
+
+ - Add support for AsyncResource \([#1403](.)\)
+
+Bugfixes:
+
+ - Fix [.reduce](.) generating unhandled rejection events \([#1501](.)\)
+ - Fix [Promise.reduce](.) generating unhandled rejction events \([#1502](.)\)
+ - Fix [.map](.) and [.filter](.) generating unhandled rejection events \([#1487](.)\)
+ - Fix [Promise.map](.) unhandled rejection events \([#1489](.)\)
+ - Fix cancel skipping upward propagation \([#1459](.)\)
+ - Fix loadTimes deprecation \([#1505](.)\)
+ - Fix [Promise.each](.) maximum stack exceeded error \([#1326](.)\)
+ - Make PromiseRejectionEvent confrom to spec \([#1509](.)\)
+ - Fix false unhandled rejection events \([#1468](.)\)
+
 ## 3.5.5 (2019-05-24)
 
 Features:
diff --git a/package.json b/package.json
index 37a41ff7b..225508e93 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "bluebird",
   "description": "Full featured Promises/A+ implementation with exceptionally good performance",
-  "version": "3.5.5",
+  "version": "3.6.0",
   "keywords": [
     "promise",
     "performance",