diff --git a/docs/index.html b/docs/index.html
index ef7fd6b24..dbc1313c9 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -29,7 +29,9 @@
         <li><a href="#Games">Locating Game Images (aka, ROMs)</a></li>
         <li><a href="#Playing">Playing a Game</a></li>
         <li><a href="#Keyboard">Keyboard Layout</a></li>
+        <li><a href="#Hotkeys">Hotkeys</a></li>
         <li><a href="#ControlMap">Controller Map</a></li>
+        <li><a href="#TimeMachine">Stella's 'Time Machine'</a></li>
       </ul>
     </li>
     <li><a href="#Advanced">Advanced Configuration</a><br>
@@ -619,6 +621,7 @@
   <p><img src="graphics/qwertz.png"></p>
   <br/>
 
+  <h2><b><a name="Hotkeys">Hotkeys</a></b></h2>
   <p><b>Console Controls (can be remapped)</b></p>
 
   <table BORDER=2 cellpadding=4>
@@ -1785,6 +1788,43 @@
   </blockquote>
 
 
+
+  <br><br>
+  <p><h2>
+  <a name="TimeMachine">Stella's 'Time Machine'</a></h2>
+
+  <p>A special feature of Stella is the 'Time Machine' mode. In this mode, Stella
+  automatically creates savestates in regular, user-defined intervals. You can then
+  interrupt the current emulation and navigate back and forth within the timeline.
+  This can be done either by using the Time Machine hotkeys described in
+  <a href="#Hotkeys"><b>Hotkeys</b> - Other Keys</a> or by using the Time Machine
+  dialog. To enter this dialog, either use one of the hotkeys or press 'T'.</p>
+
+  <p><b>Time Machine</b> dialog:</p>
+  <table border="5" cellpadding="2" frame="box" rules="none">
+    <tr>
+      <td>TODO: Screenshot</td>
+      <td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
+      <td valign="top">
+        <table border="1" cellpadding="4">
+          <tr><th>Item</th><th>Description</th></tr>
+          <tr><td>Button</td><td>TODO</td></tr>
+          <tr><td>Button</td><td></td></tr>
+          <tr><td>Button</td><td></td></tr>
+          <tr><td>Button</td><td></td></tr>
+          <tr><td>Button</td><td></td></tr>
+          <tr><td>Button</td><td></td></tr>
+          <tr><td>Button</td><td></td></tr>
+        </table>
+      </td>
+    </tr>
+  </table>
+  <br>
+
+
+  <p>The 'Time Machine' mode can be configured by the user. For details see
+  <a href="#Debugger"><b>Developer Options</b> - Time Machine dialog</a></h2>.</p>
+
 <!-- /////////////////////////////////////////////////////////////////////////  -->
   <br><br>
   <p><h1>