diff --git a/CHANGES b/CHANGES
index 51538f0ac4..3f57ed7e62 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 3.6.0-beta4 - 24 October 2021
 
+* 10607: P2P address book entries with spaces in address cause
+    StringIndexOutOfBoundsException
+* 10604: Match blank passwords less eagerly
 * 10603: Action Buttons should not respond to Shift+Click, Ctrl+Click,
     Alt+Click, Cmd+Click
 * 10602: Don't unselect piece about to get context menu with Ctrl+RightClick
diff --git a/dist/notes/data.json b/dist/notes/data.json
index e34f04e496..737efe328a 100644
--- a/dist/notes/data.json
+++ b/dist/notes/data.json
@@ -30,6 +30,8 @@
         { "num": 10505, "desc": "Enable Offset options to work with the Grid option in SendToLocation" }
       ],
       "bug_fixes": [
+        { "num": 10607, "desc": "P2P address book entries with spaces in address cause StringIndexOutOfBoundsException" },
+        { "num": 10604, "desc": "Match blank passwords less eagerly" },
         { "num": 10603, "desc": "Action Buttons should not respond to Shift+Click, Ctrl+Click, Alt+Click, Cmd+Click" },
         { "num": 10602, "desc": "Don't unselect piece about to get context menu with Ctrl+RightClick" },
         { "num": 10601, "desc": "Flares weren't responding to Cmd key on MacOS" },