diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/update.dtd b/toolkit/locales/en-US/chrome/mozapps/extensions/update.dtd
index 558b16ee3150..df5bc5e255f8 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/update.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/extensions/update.dtd
@@ -1,5 +1,12 @@
 <!ENTITY  updateWizard.title              "&brandShortName; Update">
 
+<!ENTITY  offline.title                   "&brandShortName; is working offline">
+<!ENTITY  offline.description             "&brandShortName; needs to go online in order to see if updates
+                                           are available for your add-ons to make them compatible with this
+                                           version.">
+<!ENTITY  offline.toggleOffline.label     "Go online now.">
+<!ENTITY  offline.toggleOffline.accesskey "G">
+
 <!ENTITY  mismatch.win.title              "Incompatible Add-ons">
 <!ENTITY  mismatch.introduction1.label    "The following add-ons are not compatible with this version
                                            of &brandShortName;:">
diff --git a/toolkit/mozapps/extensions/content/update.js b/toolkit/mozapps/extensions/content/update.js
index 841ec0756de2..6b9a555f27ac 100644
--- a/toolkit/mozapps/extensions/content/update.js
+++ b/toolkit/mozapps/extensions/content/update.js
@@ -89,8 +89,14 @@ var gUpdateWizard = {
     }
     catch (e) {
     }
-    document.documentElement.currentPage = 
-      document.getElementById("versioninfo");
+    var ioService = Components.classes["@mozilla.org/network/io-service;1"]
+                              .getService(Components.interfaces.nsIIOService);
+    if (ioService.offline)
+      document.documentElement.currentPage = 
+        document.getElementById("offline");
+    else
+      document.documentElement.currentPage = 
+        document.getElementById("versioninfo");
   },
   
   onWizardFinish: function ()
@@ -161,6 +167,22 @@ var gUpdateWizard = {
   }
 };
 
+var gOfflinePage = {
+  onPageAdvanced: function ()
+  {
+    var ioService = Components.classes["@mozilla.org/network/io-service;1"]
+                              .getService(Components.interfaces.nsIIOService);
+    ioService.offline = false;
+    return true;
+  },
+  
+  toggleOffline: function ()
+  {
+    var nextbtn = document.documentElement.getButton("next");
+    nextbtn.disabled = !nextbtn.disabled;
+  }
+}
+
 var gVersionInfoPage = {
   _completeCount: 0,
   _totalCount: 0,
diff --git a/toolkit/mozapps/extensions/content/update.xul b/toolkit/mozapps/extensions/content/update.xul
index 1eede116429a..669fcad6636f 100644
--- a/toolkit/mozapps/extensions/content/update.xul
+++ b/toolkit/mozapps/extensions/content/update.xul
@@ -67,6 +67,17 @@
   
   <wizardpage id="dummy" pageid="dummy"/>
   
+  <wizardpage id="offline" pageid="offline" next="versioninfo"
+              label="&offline.title;"
+              onpageadvanced="return gOfflinePage.onPageAdvanced();">
+    <description>&offline.description;</description>
+    <checkbox id="toggleOffline"
+              checked="true"
+              label="&offline.toggleOffline.label;"
+              accesskey="&offline.toggleOffline.accesskey;"
+              oncommand="gOfflinePage.toggleOffline();"/>
+  </wizardpage>
+  
   <wizardpage id="versioninfo" pageid="versioninfo" next="mismatch"
               label="&compatCheck.title;"
               onpageshow="gVersionInfoPage.onPageShow();">