diff --git a/calendar/base/content/preferences/general.js b/calendar/base/content/preferences/general.js
index 034ee59e2948..cb97d6bd08a8 100644
--- a/calendar/base/content/preferences/general.js
+++ b/calendar/base/content/preferences/general.js
@@ -58,5 +58,12 @@ var gGeneralPane = {
         var selectedIndex = dateFormatMenuList.selectedIndex;
         dateFormatMenuList.selectedIndex = -1;
         dateFormatMenuList.selectedIndex = selectedIndex;
+    },
+
+    autoRefreshPrefChanged: function() {
+        var autoRefreshPref =
+            document.getElementById("calendar.autorefresh.enabled").value;
+        document.getElementById("calendar.autorefresh.timeout").disabled = 
+            !autoRefreshPref;
     }
 };
diff --git a/calendar/base/content/preferences/general.xul b/calendar/base/content/preferences/general.xul
index 73cbcb78a83a..49daa29bb969 100644
--- a/calendar/base/content/preferences/general.xul
+++ b/calendar/base/content/preferences/general.xul
@@ -55,6 +55,8 @@
                 src="chrome://calendar/content/preferences/general.js"/>
         <script type="application/x-javascript"
                 src="chrome://calendar/content/calendarUtils.js"/>
+        <script type="application/x-javascript"
+                src="chrome://calendar/content/calendar-dialog-utils.js"/>
 
         <!-- Get the localized text for use in the .js -->
         <script type="application/x-javascript">
@@ -72,6 +74,13 @@
             <preference id="calendar.alarms.defaultsnoozelength"
                         name="calendar.alarms.defaultsnoozelength"
                         type="int"/>
+            <preference id="calendar.autorefresh.enabled"
+                        name="calendar.autorefresh.enabled"
+                        type="bool"
+                        onchange="gGeneralPane.autoRefreshPrefChanged();"/>
+            <preference id="calendar.autorefresh.timeout"
+                        name="calendar.autorefresh.timeout"
+                        type="int"/>
         </preferences>
 
         <groupbox>
@@ -117,6 +126,20 @@
 
         </groupbox>
 
+        <groupbox>
+            <caption label="&pref.refreshbox.label;"/>
+            <hbox align="center">
+                <checkbox label="&pref.autorefresh.label;"
+                          preference="calendar.autorefresh.enabled"/>
+                <textbox id="refreshtimeout"
+                         preference="calendar.autorefresh.timeout"
+                         maxlength="3"
+                         size="3"
+                         oninput="validateNaturalNums(event);"/>
+                <label value="&calendar.global.units.minutes;"/>
+            </hbox>
+        </groupbox>
+
         <separator/>
 
     </prefpane>