diff --git a/doc/fixes36.4 b/doc/fixes36.4
index 57dc6c55f..a4b8991c4 100644
--- a/doc/fixes36.4
+++ b/doc/fixes36.4
@@ -35,8 +35,3 @@ General New Features
 --------------------
 none
 
-
-Platform- and/or Interface-Specific Post-Release Fixes 
--------------------------------------------------------
-Windows OPTIONS=map_mode:fit_to_screen could cause a game start failure
-
diff --git a/doc/fixes36.5 b/doc/fixes36.5
index d3e45ff39..e4bfd7949 100644
--- a/doc/fixes36.5
+++ b/doc/fixes36.5
@@ -7,6 +7,8 @@ focus will shift to the next major release.
 
 General Fixes and Modified Features
 -----------------------------------
+have string_for_opt() return empty_optstr on failure
+ensure existing callers of string_for_opt() check the return value before using it
 
 
 Fixes to Post-3.6.4 Problems that Were Exposed Via git Repository
@@ -15,6 +17,7 @@ Fixes to Post-3.6.4 Problems that Were Exposed Via git Repository
 
 Platform- and/or Interface-Specific Fixes or Features
 -----------------------------------------------------
+Windows OPTIONS=map_mode:fit_to_screen could cause a game start failure
 
 
 General New Features