diff --git a/Changes.txt b/Changes.txt
index 4ab15e2a0..36c85218e 100644
--- a/Changes.txt
+++ b/Changes.txt
@@ -14,6 +14,10 @@
 
 6.0 to 6.x: (MM dd, 2019)
 
+  * Note: because of major event remapping changes, all remappings will be
+          reset to defaults; if you had custom mappings, they will need to
+          be re-entered again.
+
   * Updated internal ROM properties database to ROM-Hunter version 15
     (thanks go to RomHunter for his tireless research in this area).
     Related to this, updated the snapshot collection.
@@ -25,14 +29,20 @@
      - delayed player 1 swap
      - stuffed player move
 
+  * Added proper Retron77 port. (TODO: doc)
+
   * Completely removed 'Display_Height' stuff. (TODO: doc)
 
   * Disabled some developer options for 'Player settings'. (TODO: doc)
 
-  * Enhanced command dialog to display current state. 
+  * Enhanced command dialog to display current state.
 
   * Added automatic controller detection. (TODO: Stella.pro cleanup)
 
+  * Removed 'tia.fsfill' option, replacing it with 'tia.fs_stretch'.  This
+    new option allows to preserve TIA image aspect ratio in fullscreen
+    mode, or stretch to fill the entire screen.
+
   * Removed superfluous controller option 'PADDLES_IDIR'.
 
   * Added hotkey for sound on/off.
diff --git a/docs/index.html b/docs/index.html
index 065b56e53..f81ad22ae 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1968,9 +1968,9 @@
     </tr>
 
     <tr>
-      <td><pre>-tia.fsfill &lt;1|0&gt;</pre></td>
-      <td>Stretch TIA image completely while in fullscreen mode
-        (vs. an integral stretch which won't necessarily completely fill the screen).</td>
+      <td><pre>-tia.fs_stretch &lt;1|0&gt;</pre></td>
+      <td>Stretch TIA image completely while in fullscreen mode, vs. keeping the correct
+        aspect ratio.</td>
     </tr>
 
     <tr>
@@ -2645,7 +2645,7 @@
           <tr><td>PAL aspect</td><td>Width of TIA image in PAL mode</td><td>-tia.aspectp</td></tr>
           <tr><td>Emul. speed</td><td>Emulation speed</td><td>-speed</td></tr>
           <tr><td>Fullscreen</td><td>Self-explanatory</td><td>-fullscreen</td></tr>
-          <tr><td>Fullscreen fill</td><td>Completely fill TIA image in fullscreen</td><td>-tia.fsfill</td></tr>
+          <tr><td>Fullscreen stretch</td><td>In fullscreen mode, completely fill screen with TIA image</td><td>-tia.fs_stretch</td></tr>
           <tr><td>VSync</td><td>Enable vertical synced updates</td><td>-vsync</td></tr>
           <tr><td>Fast SuperCharger load</td><td>Skip progress loading bars for SuperCharger ROMs</td><td>-fastscbios</td></tr>
           <tr><td>Show UI messages</td><td>Overlay UI messages onscreen</td><td>-uimessages</td></tr>
diff --git a/src/emucore/FrameBuffer.cxx b/src/emucore/FrameBuffer.cxx
index fa3b725fd..cebf92b33 100644
--- a/src/emucore/FrameBuffer.cxx
+++ b/src/emucore/FrameBuffer.cxx
@@ -738,7 +738,7 @@ bool FrameBuffer::changeVidMode(int direction)
     myOSystem.sound().mute(oldMuteState);
 
     if(fullScreen())
-      myOSystem.settings().setValue("tia.fsfill",
+      myOSystem.settings().setValue("tia.fs_stretch",
           mode.stretch == VideoMode::Stretch::Fill);
     else
       myOSystem.settings().setValue("tia.zoom", mode.zoom);
@@ -913,7 +913,7 @@ const FrameBuffer::VideoMode& FrameBuffer::getSavedVidMode(bool fullscreen)
   else  // TIA mode
   {
     if(fullscreen)
-      myCurrentModeList->setByStretch(myOSystem.settings().getBool("tia.fsfill")
+      myCurrentModeList->setByStretch(myOSystem.settings().getBool("tia.fs_stretch")
         ? VideoMode::Stretch::Fill : VideoMode::Stretch::Preserve);
     else
       myCurrentModeList->setByZoom(myOSystem.settings().getInt("tia.zoom"));
diff --git a/src/emucore/Settings.cxx b/src/emucore/Settings.cxx
index c62fcc32d..a100fa9b0 100644
--- a/src/emucore/Settings.cxx
+++ b/src/emucore/Settings.cxx
@@ -44,7 +44,7 @@ Settings::Settings()
   setPermanent("tia.inter", "false");
   setPermanent("tia.aspectn", "100");
   setPermanent("tia.aspectp", "100");
-  setPermanent("tia.fsfill", "false");
+  setPermanent("tia.fs_stretch", "false");
   setPermanent("tia.dbgcolors", "roygpb");
 
   // TV filtering options
@@ -388,7 +388,7 @@ void Settings::usage() const
     << "                                 mode\n"
     << "  -tia.aspectp   <number>       Scale TIA width by the given percentage in PAL\n"
     << "                                 mode\n"
-    << "  -tia.fsfill    <1|0>          Stretch TIA image to fill fullscreen mode\n"
+    << "  -tia.fs_stretch <1|0>         Stretch TIA image to fill fullscreen mode\n"
     << "  -tia.dbgcolors <string>       Debug colors to use for each object (see manual\n"
     << "                                 for description)\n"
     << endl
diff --git a/src/gui/VideoDialog.cxx b/src/gui/VideoDialog.cxx
index 78511f068..d1917b667 100644
--- a/src/gui/VideoDialog.cxx
+++ b/src/gui/VideoDialog.cxx
@@ -191,7 +191,7 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent,
   ypos += lineHeight + VGAP;*/
 
   // FS stretch
-  myUseStretch = new CheckboxWidget(myTab, font, xpos, ypos + 1, "Fullscreen fill");
+  myUseStretch = new CheckboxWidget(myTab, font, xpos, ypos + 1, "Fullscreen stretch");
   wid.push_back(myUseStretch);
   ypos += (lineHeight + VGAP) * 2;
 
@@ -361,7 +361,7 @@ void VideoDialog::loadConfig()
   myFullScreenMode->setSelected(mode);*/
 
   // Fullscreen stretch setting
-  myUseStretch->setState(instance().settings().getBool("tia.fsfill"));
+  myUseStretch->setState(instance().settings().getBool("tia.fs_stretch"));
 
   // Use sync to vertical blank
   myUseVSync->setState(instance().settings().getBool("vsync"));
@@ -432,7 +432,7 @@ void VideoDialog::saveConfig()
   /*instance().settings().setValue("fullscreenmode",
                                  myFullScreenMode->getSelectedTag().toString());*/
   // Fullscreen stretch setting
-  instance().settings().setValue("tia.fsfill", myUseStretch->getState());
+  instance().settings().setValue("tia.fs_stretch", myUseStretch->getState());
 
   // Use sync to vertical blank
   instance().settings().setValue("vsync", myUseVSync->getState());
diff --git a/src/unix/r77/SettingsR77.cxx b/src/unix/r77/SettingsR77.cxx
index d378c9053..5047f6912 100644
--- a/src/unix/r77/SettingsR77.cxx
+++ b/src/unix/r77/SettingsR77.cxx
@@ -33,7 +33,7 @@ SettingsR77::SettingsR77()
   setPermanent("vsync", "true");
 
   setPermanent("tia.zoom", "3");
-  setPermanent("tia.fsfill", "false");  // start in 4:3 by default
+  setPermanent("tia.fs_stretch", "false");  // start in 4:3 by default
 
   setPermanent("audio.buffer_size", "6");
   setPermanent("audio.enabled", "1");
@@ -79,7 +79,7 @@ bool SettingsR77::saveConfigFile(const string& cfgfile) const
 
   out << "fullscreen = " << getString("fullscreen") << endl;
   out << "lastrom = " << getString("lastrom") << endl;
-  out << "tia.fsfill = " << getString("tia.fsfill") << endl;
+  out << "tia.fs_stretch = " << getString("tia.fs_stretch") << endl;
 //   out << "keymap = " << getString("keymap") << endl;
 //   out << "joymap = " << getString("joymap") << endl;