diff --git a/docs/html/config_timeshift.html b/docs/html/config_timeshift.html
new file mode 100644
index 00000000..4c3420e3
--- /dev/null
+++ b/docs/html/config_timeshift.html
@@ -0,0 +1,37 @@
+<div class="hts-doc-text">
+
+ <p>
+ This tab is used to configure timeshift properties.
+
+ <p>
+ Configuration options:
+ <dl>
+  <dt>Enabled
+  <dd>Turn on and off timeshift.
+
+  <dt>On-Demand
+  <dd>Turn this on to only begin timeshift recording when pause is pressed. 
+      Leave unchecked for always timeshifting. (Rewinding even if you haven't pressed
+      pause.)
+
+  <dt>Storage Path:
+  <dd>Where should the timeshift data be stored.
+
+  <dt>Max. Period (mins):
+  <dd>Specify the number of minutes to put into the timeshift.
+
+  <dt>Unlimited:
+  <dd>If checked, this overrides Max Period (mins) and will continue to timeshift until your
+      hard drive or other storage medium fills up.
+
+  <dt>Max. Size (MB)
+  <dd>Specifies in Megabytes how big the timeshift file should get. 
+
+  <dt>Unlimited:
+  <dd>If checked, this overrides Max Size (MB) and will continue to timeshift until your
+      hard drive or other storage medium fills up
+
+ </dl>
+ Changes to any of these settings must be confirmed by pressing the
+ 'Save configuration' button before taking effect.
+</div>
diff --git a/src/webui/static/app/timeshift.js b/src/webui/static/app/timeshift.js
index 7f27ba4f..e1a78aa9 100644
--- a/src/webui/static/app/timeshift.js
+++ b/src/webui/static/app/timeshift.js
@@ -47,7 +47,7 @@ tvheadend.timeshift = function() {
   });
 
   var timeshiftUnlPeriod = new Ext.form.Checkbox({
-    fieldLabel: '  unlimited',
+    fieldLabel: '  Unlimited',
     name: 'timeshift_unlimited_period',
     Width: 300
   });
@@ -60,7 +60,7 @@ tvheadend.timeshift = function() {
   });
 
   var timeshiftUnlSize = new Ext.form.Checkbox({
-    fieldLabel: '  unlimited',
+    fieldLabel: '  Unlimited',
     name: 'timeshift_unlimited_size',
     Width: 300
   });