diff --git a/toolkit/locales/en-US/chrome/mozapps/update/updates.dtd b/toolkit/locales/en-US/chrome/mozapps/update/updates.dtd
index 7c7473752834..6b8e8fa08f6b 100755
--- a/toolkit/locales/en-US/chrome/mozapps/update/updates.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/update/updates.dtd
@@ -6,6 +6,9 @@
 <!ENTITY  cancel.label                    "Cancel">
 <!ENTITY  cancel.accesskey                "C">
 
+<!ENTITY  noupdatesfound.title            "No Updates Found">
+<!ENTITY  noupdatesfound.intro            "There are no new updates available. &brandShortName; may check periodically for new updates.">
+
 <!ENTITY  updatesfound.title              "Updates Available">
 
 <!ENTITY  forMoreInfo.label               "For more information, ">
diff --git a/toolkit/mozapps/update/content/updates.css b/toolkit/mozapps/update/content/updates.css
index 185c0e8376c8..605f2f31af40 100755
--- a/toolkit/mozapps/update/content/updates.css
+++ b/toolkit/mozapps/update/content/updates.css
@@ -5,7 +5,9 @@ wizard[description=""] .wizard-header-description {
 }
 
 wizard[currentpageid="license"] .wizard-buttons,
-wizard[currentpageid="errors"] .wizard-buttons {
+wizard[currentpageid="errors"] .wizard-buttons,
+wizard[currentpageid="noupdatesfound"] .wizard-buttons,
+wizard[currentpageid="checking"] .wizard-buttons {
   display: -moz-box;
 }
 
diff --git a/toolkit/mozapps/update/content/updates.js b/toolkit/mozapps/update/content/updates.js
index 97566786f140..4f9ea6c94718 100755
--- a/toolkit/mozapps/update/content/updates.js
+++ b/toolkit/mozapps/update/content/updates.js
@@ -164,6 +164,8 @@ var gCheckingPage = {
       if (!gUpdates.update) {
         LOG("Could not select an appropriate update, either because there were none," + 
             " or |selectUpdate| failed.");
+        var checking = document.getElementById("checking");
+        checking.setAttribute("next", "noupdatesfound");
       }
       document.documentElement.advance();
     },
@@ -187,6 +189,14 @@ var gCheckingPage = {
   }
 };
 
+var gNoUpdatesPage = {
+  onPageShow: function() {
+    document.documentElement.getButton("back").disabled = true;
+    document.documentElement.getButton("cancel").disabled = true;
+    document.documentElement.getButton("finish").focus();
+  }
+};
+
 var gUpdatesAvailablePage = {
   _incompatibleItems: null,
   
diff --git a/toolkit/mozapps/update/content/updates.xul b/toolkit/mozapps/update/content/updates.xul
index 2151c5b1718a..1f546a3e39b8 100755
--- a/toolkit/mozapps/update/content/updates.xul
+++ b/toolkit/mozapps/update/content/updates.xul
@@ -64,19 +64,21 @@
   </stringbundleset>
 
   <wizardpage id="checking" pageid="checking" next="updatesfound"
+              label="&checking.title;" 
               onpageshow="gCheckingPage.onPageShow();">
     <vbox class="content" flex="1">
       <label>&checking.label;</label>
       <separator/>
       <progressmeter id="checkingProgress" mode="undetermined"/>
-      <separator flex="1"/>
-      <hbox pack="end">
-        <button label="&cancel.label;" accesskey="&cancel.accesskey;"
-                oncommand="gCheckingPage.onClose();"/>
-      </hbox>
     </vbox>
   </wizardpage>
   
+  <wizardpage id="noupdatesfound" pageid="noupdatesfound" class="content"
+              label="&noupdatesfound.title;"
+              onpageshow="gNoUpdatesPage.onPageShow();">
+    <label>&noupdatesfound.intro;</label>
+  </wizardpage>
+  
   <wizardpage id="updatesfound" pageid="updatesfound" next="downloading"
               onpageshow="gUpdatesAvailablePage.onPageShow();" flex="1">
     <vbox id="update-info" flex="1">
diff --git a/toolkit/mozapps/update/src/nsUpdateService.js.in b/toolkit/mozapps/update/src/nsUpdateService.js.in
index 4f1e219da216..bfd6f471d9e2 100644
--- a/toolkit/mozapps/update/src/nsUpdateService.js.in
+++ b/toolkit/mozapps/update/src/nsUpdateService.js.in
@@ -1574,10 +1574,10 @@ TimerManager.prototype = {
        *
        */
       notify: function(timer) {
-        LOG("self._timers = " + self._timers.toSource());
+        // LOG("self._timers = " + self._timers.toSource());
         var lastUpdateTime = self._timers[this.id].lastUpdateTime;
         var now = Math.round(Date.now() / 1000);
-        LOG("notify = " + (now - lastUpdateTime) + " > " + this.interval);
+        // LOG("notify = " + (now - lastUpdateTime) + " > " + this.interval);
         
         // Fudge the lastUpdateTime by some random increment of the update 
         // check interval (e.g. some random slice of 10 minutes) so that when