diff --git a/Changes.txt b/Changes.txt
index 50111ad30..75d014b70 100644
--- a/Changes.txt
+++ b/Changes.txt
@@ -14,6 +14,8 @@
 
 6.5.3 to 6.6 (??? ??, 202?)
 
+  * Added PlusROMs support for saving high scores
+
   * Added preliminary support for 'MVC' bankswitching scheme by
     Rob Bairos.
 
diff --git a/docs/index.html b/docs/index.html
index d6e5a7ff8..5b196d76f 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -307,7 +307,7 @@
       TIA sprites and collisions for each object separately</li>
     <li>Full system state save/load functionality</li>
     <li>Automatic save state creation ('Time Machine') which allows moving back and forth in the recorded timeline</li>
-    <li>High scores saving</li>
+    <li>High scores saving (internal or via PlusROMs store)</li>
     <li>Cross-platform UI including a built-in ROM launcher frontend</li>
     <li>Built-in extensive debugger, including static analysis with the Distella disassembler
       and dynamic analysis at runtime by tracking code/graphics/data sections, and
@@ -2086,6 +2086,12 @@
       <td>Alt + Up arrow</td>
       <td>Cmd + Up arrow</td>
     </tr>
+    <tr>
+      <td>Enter/Exit the PlusROMs setup dialog</td>
+      <td>Shift-Control-Alt + P</td>
+      <td>Shift-Control-Cmd + P</td>
+    </tr>
+
   </table>
 
   <p><b>UI Keys (can be remapped)</b></p>
@@ -3235,6 +3241,19 @@
       <br>Note: Only available for Windows</td>
     </tr>
 
+    << "  -plusroms.nick <nick>        Define a nickname for the PlusROMs store\n"
+    << "  -plusroms.id   <id>          Define an ID for the PlusROMs store\n"
+
+    <tr>
+      <td><pre>-plusroms.nick &lt;name&gt;</pre></td>
+      <td>Define a nickname for the PlusROMs store</td>
+    </tr>
+
+    <tr>
+      <td><pre>-plusroms.id &lt;id&gt;</pre></td>
+      <td>Define an ID for the PlusROMs store (32 chars, hex)</td>
+    </tr>
+
     <tr>
       <td><pre>-help</pre></td>
       <td>Print a help message describing these options, and then
diff --git a/src/emucore/Settings.cxx b/src/emucore/Settings.cxx
index 16dd4aef1..a55ab4564 100644
--- a/src/emucore/Settings.cxx
+++ b/src/emucore/Settings.cxx
@@ -602,6 +602,8 @@ void Settings::usage() const
     << "  -basedir  <path>             Override the base directory for all config files\n"
     << "  -baseinappdir                Override the base directory for all config files\n"
     << "                                by attempting to use the application directory\n"
+    << "  -plusroms.nick <nick>        Define a nickname for the PlusROMs store.\n"
+    << "  -plusroms.id   <id>          Define an ID for the PlusROMs store.\n"
     << "  -help                        Show the text you're now reading\n"
   #ifdef DEBUGGER_SUPPORT
     << endl
diff --git a/src/gui/PlusRomsSetupDialog.cxx b/src/gui/PlusRomsSetupDialog.cxx
index f26a0d5ef..be095219e 100644
--- a/src/gui/PlusRomsSetupDialog.cxx
+++ b/src/gui/PlusRomsSetupDialog.cxx
@@ -53,7 +53,7 @@ void PlusRomsSetupDialog::handleCommand(CommandSender* sender, int cmd,
         instance().eventHandler().leaveMenuMode();
       }
       else
-        setMessage("Two characters minimum");
+        setMessage(MIN_NICK_LEN_STR + string(" characters minimum"));
       break;
     }
     case kCloseCmd:
diff --git a/src/gui/WhatsNewDialog.cxx b/src/gui/WhatsNewDialog.cxx
index b09b4cdbb..582f7b36e 100644
--- a/src/gui/WhatsNewDialog.cxx
+++ b/src/gui/WhatsNewDialog.cxx
@@ -67,7 +67,6 @@ WhatsNewDialog::WhatsNewDialog(OSystem& osystem, DialogContainer& parent,
   {
     add(ypos, "added high scores saving");
     add(ypos, "enhanced cut/copy/paste and undo/redo for text editing");
-    add(ypos, "added mouse support for text editing");
     add(ypos, "added wildcard support to launcher dialog filter");
     add(ypos, "added option to search subdirectories in launcher");
     add(ypos, "added tooltips to many UI items");
@@ -77,6 +76,7 @@ WhatsNewDialog::WhatsNewDialog(OSystem& osystem, DialogContainer& parent,
     add(ypos, "improved analog input reading");
     add(ypos, "improved multi-monitor support");
   }
+  add(ypos, "added PlusROMs support for saving high scores");
   add(ypos, "added MovieCart support");
   add(ypos, "added weblinks for many games");
   add(ypos, "debugger: added optional logging of breaks and traps");