diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78ce7d480..307bc3ddf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,39 @@
+### 1.3.6 Maintenance Release
+
+Editor
+
+ - Keep proper track of moved/changed state in undo/redo history Fixes #2999
+ - Fix typo in zh-CN translation (#3003) @JiyeYu
+ - Do not assign z property to tab node when updating flow Fixes #3010
+ - Ensure RED.clipboard.import displays the right library Fixes #3021
+ - Handle node icon paths for scoped modules Fixes #3013
+ - Emit nodes:change for any updated config node when node deleted/added (#3047) @knolleary
+ - Fix padding of compact notification Closes #3045
+ - Fix scriptFile handling in themes (#3054) @bonanitech
+ - Fix grip on horizontally displayed panels separator (#3055) @bonanitech
+ - Avoid prototype pollution in RED.view.calculateTextDimensions
+ - Fix focus outline overlap in button-groups Fixes #3070
+
+Runtime
+
+ - Ensure context get/set key is a string (#2993) @Steve-Mcl
+ - Update to latest 6.x ws module
+ - Fix handling of boolean subflow module properties Fixes #3000
+ - Fix over-greeding matching whilst parsing commit history Fixes #3006
+ - Fix allow Flow.getNode to return subflowInstance nodes (#3004) @KazuhiroItoh
+ - Update to latest node-red-admin
+ - Support loading external module sub path Fixes #3023
+ - Add necessary modules and remove unnecessary module in dependencies (#3058) @kazuhitoyokoi
+ - Update dependencies
+
+Nodes
+
+ - CSV: Ensure CSV node tries to parse number when set to do so (trim whitespace)
+ - Switch: Fix handling empty rules (#2991) @HiroyasuNishiyama
+ - Watch node throws errors if new files deleted (#2997) @hardillb
+ - Add full ast parsing in Function node to spot node.done calls Fixes #2998
+
+
 ### 1.3.5 Maintenance Release
 
 Editor
diff --git a/package.json b/package.json
index a0f038721..d89cbdc02 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "1.3.5",
+    "version": "1.3.6",
     "description": "Low-code programming for event-driven applications",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
@@ -74,7 +74,7 @@
         "raw-body": "2.4.1",
         "request": "2.88.0",
         "semver": "6.3.0",
-        "tar": "6.1.0",
+        "tar": "6.1.2",
         "uglify-js": "3.13.3",
         "ws": "6.2.2",
         "xml2js": "0.4.23"
diff --git a/packages/node_modules/@node-red/editor-api/package.json b/packages/node_modules/@node-red/editor-api/package.json
index 4e705fbb1..f5c89729e 100644
--- a/packages/node_modules/@node-red/editor-api/package.json
+++ b/packages/node_modules/@node-red/editor-api/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-api",
-    "version": "1.3.5",
+    "version": "1.3.6",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "1.3.5",
-        "@node-red/editor-client": "1.3.5",
+        "@node-red/util": "1.3.6",
+        "@node-red/editor-client": "1.3.6",
         "bcryptjs": "2.4.3",
         "body-parser": "1.19.0",
         "clone": "2.1.2",
diff --git a/packages/node_modules/@node-red/editor-client/package.json b/packages/node_modules/@node-red/editor-client/package.json
index a46e35fb2..54fdfb286 100644
--- a/packages/node_modules/@node-red/editor-client/package.json
+++ b/packages/node_modules/@node-red/editor-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-client",
-    "version": "1.3.5",
+    "version": "1.3.6",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
diff --git a/packages/node_modules/@node-red/nodes/package.json b/packages/node_modules/@node-red/nodes/package.json
index 223c07e96..304af1a9e 100644
--- a/packages/node_modules/@node-red/nodes/package.json
+++ b/packages/node_modules/@node-red/nodes/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/nodes",
-    "version": "1.3.5",
+    "version": "1.3.6",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
diff --git a/packages/node_modules/@node-red/registry/package.json b/packages/node_modules/@node-red/registry/package.json
index 2d6aa77b2..810d7e723 100644
--- a/packages/node_modules/@node-red/registry/package.json
+++ b/packages/node_modules/@node-red/registry/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/registry",
-    "version": "1.3.5",
+    "version": "1.3.6",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,7 +16,7 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "1.3.5",
+        "@node-red/util": "1.3.6",
         "clone": "2.1.2",
         "fs-extra": "8.1.0",
         "semver": "6.3.0",
diff --git a/packages/node_modules/@node-red/runtime/package.json b/packages/node_modules/@node-red/runtime/package.json
index c138d23ac..44d6fe88f 100644
--- a/packages/node_modules/@node-red/runtime/package.json
+++ b/packages/node_modules/@node-red/runtime/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/runtime",
-    "version": "1.3.5",
+    "version": "1.3.6",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/registry": "1.3.5",
-        "@node-red/util": "1.3.5",
+        "@node-red/registry": "1.3.6",
+        "@node-red/util": "1.3.6",
         "async-mutex": "0.3.1",
         "clone": "2.1.2",
         "express": "4.17.1",
diff --git a/packages/node_modules/@node-red/util/package.json b/packages/node_modules/@node-red/util/package.json
index c17d5050f..12b424f0a 100644
--- a/packages/node_modules/@node-red/util/package.json
+++ b/packages/node_modules/@node-red/util/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/util",
-    "version": "1.3.5",
+    "version": "1.3.6",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
diff --git a/packages/node_modules/node-red/package.json b/packages/node_modules/node-red/package.json
index 8ecc40227..77362fa61 100644
--- a/packages/node_modules/node-red/package.json
+++ b/packages/node_modules/node-red/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "1.3.5",
+    "version": "1.3.6",
     "description": "Low-code programming for event-driven applications",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
@@ -31,10 +31,10 @@
         "flow"
     ],
     "dependencies": {
-        "@node-red/editor-api": "1.3.5",
-        "@node-red/runtime": "1.3.5",
-        "@node-red/util": "1.3.5",
-        "@node-red/nodes": "1.3.5",
+        "@node-red/editor-api": "1.3.6",
+        "@node-red/runtime": "1.3.6",
+        "@node-red/util": "1.3.6",
+        "@node-red/nodes": "1.3.6",
         "basic-auth": "2.0.1",
         "bcryptjs": "2.4.3",
         "express": "4.17.1",