diff --git a/Changes.txt b/Changes.txt
index 557157f25..616ec22f7 100644
--- a/Changes.txt
+++ b/Changes.txt
@@ -37,6 +37,8 @@
 
   * Added separate positioning of launcher, emulator and debugger
 
+  * Added optional display to game refresh rate adaption in fullscreen mode
+
   * Added option which lets default ROM path follow launcher navigation
 
   * Added debugger 'saveaccess' function, which saves memory access counts to
diff --git a/docs/graphics/options_video.png b/docs/graphics/options_video.png
index deb857ca4..58654148a 100644
Binary files a/docs/graphics/options_video.png and b/docs/graphics/options_video.png differ
diff --git a/docs/index.html b/docs/index.html
index 3bf9ee26a..85ddf5b74 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -2218,6 +2218,12 @@
       aspect ratio.</td>
   </tr>
 
+  <tr>
+    <td><pre>-tia.fs_refresh &lt;1|0&gt;</pre></td>
+    <td>While in fullscreen mode, adapt the display's refresh rate to the game's frame rate
+      to minimize judder.</td>
+  </tr>
+
   <tr>
     <td><pre>-tia.fs_overscan &lt;0 - 10&gt;</pre></td>
     <td>Add overscan to TIA image while in fullscreen mode</td>
@@ -2943,13 +2949,14 @@
         <table border="1" cellpadding="4">
           <tr><th>Item</th><th>Brief description</th><th>For more information,<br>see <a href="#CommandLine">CommandLine</a></th></tr>
           <tr><td>Renderer</td><td>Use specified rendering mode</td><td>-video</td></tr>
-          <tr><td>Interpolation</td><td>Interpolation of TIA image</td><td>-tia.inter</td></tr>
-          <tr><td>Zoom</td><td>Zoom level of TIA image</td><td>-tia.zoom</td></tr>
+          <tr><td>Interpolation</td><td>Enable interpolation of the TIA image</td><td>-tia.inter</td></tr>
+          <tr><td>Zoom</td><td>Zoom level of the TIA image</td><td>-tia.zoom</td></tr>
           <tr><td>Fullscreen</td><td>Self-explanatory - Note that colors may slightly change.
                   This depends on the OS and renderer used.</td><td>-fullscreen</td></tr>
-          <tr><td>Stretch</td><td>In fullscreen mode, completely fill screen with TIA image</td><td>-tia.fs_stretch</td></tr>
+          <tr><td>Stretch</td><td>In fullscreen mode, completely fill screen with the TIA image.</td><td>-tia.fs_stretch</td></tr>
+          <tr><td>Adapt display...</td><td>In fullscreen mode, adapt the display's refresh rate to the game's frame rate to minimize judder.</td><td>-tia.fs_refresh</td></tr>
           <tr><td>Overscan</td><td>In fullscreen mode, add overscan to the TIA image</td><td>-tia.fs_overscan</td></tr>
-          <tr><td>V-Size adjust</td><td>Adjust height of TIA image</td><td>-tia.vsizeadjust</td></tr>
+          <tr><td>V-Size adjust</td><td>Adjust height of the TIA image</td><td>-tia.vsizeadjust</td></tr>
         </table>
       </td>
     </tr>
diff --git a/src/common/FrameBufferSDL2.cxx b/src/common/FrameBufferSDL2.cxx
index 9bb0dae57..612000943 100644
--- a/src/common/FrameBufferSDL2.cxx
+++ b/src/common/FrameBufferSDL2.cxx
@@ -393,7 +393,6 @@ bool FrameBufferSDL2::adaptRefreshRate(Int32 displayIndex, SDL_DisplayMode& adap
       Logger::error("ERROR: Closest display mode could not be retrieved");
       return adapt;
     }
-    factor = float(closestSdlMode.refresh_rate) / sdlMode.refresh_rate;
     factor = std::min(float(sdlMode.refresh_rate) / sdlMode.refresh_rate,
                       float(sdlMode.refresh_rate) / (sdlMode.refresh_rate - 1));
     const float diff = std::abs(factor - std::round(factor)) / factor;
@@ -404,12 +403,12 @@ bool FrameBufferSDL2::adaptRefreshRate(Int32 displayIndex, SDL_DisplayMode& adap
       adapt = true;
     }
   }
-  cerr << "refresh rate adapt ";
-  if(adapt)
-    cerr << "required (" << currentRefreshRate << " Hz -> " << adaptedSdlMode.refresh_rate << " Hz)";
-  else
-    cerr << "not required/possible";
-  cerr << endl;
+  //cerr << "refresh rate adapt ";
+  //if(adapt)
+  //  cerr << "required (" << currentRefreshRate << " Hz -> " << adaptedSdlMode.refresh_rate << " Hz)";
+  //else
+  //  cerr << "not required/possible";
+  //cerr << endl;
 
   // Only change if the display supports a better refresh rate
   return adapt;
@@ -506,7 +505,7 @@ bool FrameBufferSDL2::createRenderer(bool force)
 
   if(recreate)
   {
-    cerr << "Create new renderer for buffer type #" << int(myBufferType) << endl;
+    //cerr << "Create new renderer for buffer type #" << int(myBufferType) << endl;
     if(myRenderer)
       SDL_DestroyRenderer(myRenderer);
 
diff --git a/src/emucore/Settings.cxx b/src/emucore/Settings.cxx
index dca79717d..790c784bb 100644
--- a/src/emucore/Settings.cxx
+++ b/src/emucore/Settings.cxx
@@ -442,7 +442,7 @@ void Settings::usage() const
     << "  -tia.inter       <1|0>        Enable interpolated (smooth) scaling for TIA\n"
     << "                                 image\n"
     << "  -tia.fs_stretch  <1|0>        Stretch TIA image to fill fullscreen mode\n"
-    << "  -tia.fs_refresh  <1|0>        Try to adapt display refresh rate to game\n"
+    << "  -tia.fs_refresh  <1|0>        Try to adapt display refresh rate to game's FPS\n"
     << "  -tia.fs_overscan <0-10>       Add overscan to TIA image in fullscreen mode\n"
     << "  -tia.dbgcolors   <string>     Debug colors to use for each object (see manual\n"
     << "                                 for description)\n"