diff --git a/CHANGES b/CHANGES
index 3f57ed7e62..7d170a3a68 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+3.6.0-beta5 - 25 October 2021
+
+* 10620: Fix NPE EditPropertiesAction.windowClosed()
+* 10616: Mouseover Stack Viewer was failing to launch in certain situations
+* 10615: Stack NPE in Mat Movement code
+
 3.6.0-beta4 - 24 October 2021
 
 * 10607: P2P address book entries with spaces in address cause
diff --git a/dist/notes/data.json b/dist/notes/data.json
index 737efe328a..fb56692e58 100644
--- a/dist/notes/data.json
+++ b/dist/notes/data.json
@@ -16,7 +16,20 @@
     { "display_name": "Other", "suffix": "other.zip" }
   ],
   "changes": [
-       {
+    {
+      "in": "3.6.0-beta5",
+      "since": "3.6.0-beta4",
+      "new_features": [
+      ],
+      "bug_fixes": [
+        { "num": 10620, "desc": "Fix NPE EditPropertiesAction.windowClosed()" },
+        { "num": 10616, "desc": "Mouseover Stack Viewer was failing to launch in certain situations" },
+        { "num": 10615, "desc": "Stack NPE in Mat Movement code" }
+      ],
+      "other_improvements": [
+      ]
+    },
+    {
       "in": "3.6.0-beta4",
       "since": "3.6.0-beta3",
       "new_features": [