diff --git a/mozilla/client.mk b/mozilla/client.mk
index b027a7aed67..2384ef45b98 100644
--- a/mozilla/client.mk
+++ b/mozilla/client.mk
@@ -193,6 +193,8 @@ LOCALES_core :=                                 \
 BOOTSTRAP_core :=                               \
   mozilla/browser/config/version.txt            \
   mozilla/mail/config/version.txt               \
+  mozilla/calendar/sunbird/config/version.txt   \
+  $(NULL)
 
 MODULES_NS_toolkit :=                           \
   $(MODULES_NS_core)                            \
diff --git a/mozilla/extensions/inspector/Makefile.in b/mozilla/extensions/inspector/Makefile.in
index 1a3d0c24f95..5734e74038c 100644
--- a/mozilla/extensions/inspector/Makefile.in
+++ b/mozilla/extensions/inspector/Makefile.in
@@ -65,11 +65,12 @@ DIST_FILES = install.rdf
 # that we've even pulled those files. So we hardcode them.
 
 XULAPP_DEFINES = \
-	-DFIREFOX_VERSION=$(FIREFOX_VERSION) \
-	-DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
-	-DSEAMONKEY_VERSION=$(SEAMONKEY_VERSION) \
-	-DEXTENSION_VERSION=$(MOZILLA_VERSION) \
-	$(NULL)
+    -DFIREFOX_VERSION=$(FIREFOX_VERSION) \
+    -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
+    -DSUNBIRD_VERSION=$(SUNBIRD_VERSION) \
+    -DSEAMONKEY_VERSION=$(SEAMONKEY_VERSION) \
+    -DEXTENSION_VERSION=$(MOZILLA_VERSION) \
+    $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/extensions/inspector/install.rdf b/mozilla/extensions/inspector/install.rdf
index d1e30fe22a1..a4c81c87dbf 100644
--- a/mozilla/extensions/inspector/install.rdf
+++ b/mozilla/extensions/inspector/install.rdf
@@ -26,6 +26,15 @@
       </Description>
     </em:targetApplication>
 
+    <em:targetApplication>
+      <!-- Sunbird -->
+      <Description>
+        <em:id>{718e30fb-e89b-41dd-9da7-e25a45638b28}</em:id>
+        <em:minVersion>@SUNBIRD_VERSION@</em:minVersion>
+        <em:maxVersion>@SUNBIRD_VERSION@</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+
     <em:targetApplication>
       <!-- Suite -->
       <Description>
diff --git a/mozilla/extensions/inspector/jar.mn b/mozilla/extensions/inspector/jar.mn
index ca6eac674da..10981210e7e 100644
--- a/mozilla/extensions/inspector/jar.mn
+++ b/mozilla/extensions/inspector/jar.mn
@@ -4,6 +4,7 @@ inspector.jar:
 % overlay chrome://communicator/content/pref/preftree.xul chrome://inspector/content/prefs/prefsOverlay.xul
 % overlay chrome://browser/content/browser.xul chrome://inspector/content/tasksOverlay-ff.xul
 % overlay chrome://browser/content/macBrowserOverlay.xul chrome://inspector/content/tasksOverlay-ff.xul
+% overlay chrome://calendar/content/calendar.xul chrome://inspector/content/tasksOverlay-sb.xul
 % overlay chrome://messenger/content/mailWindowOverlay.xul chrome://inspector/content/tasksOverlay-tb.xul
 % overlay chrome://inspector/content/commandOverlay.xul chrome://inspector/content/viewers/dom/commandOverlay.xul
 % overlay chrome://inspector/content/commandOverlay.xul chrome://inspector/content/viewers/styleRules/commandOverlay.xul
@@ -29,6 +30,7 @@ inspector.jar:
   content/inspector/statusbarOverlay.xul                              (resources/content/statusbarOverlay.xul)
   content/inspector/tasksOverlay.xul                                  (resources/content/tasksOverlay.xul)
   content/inspector/tasksOverlay-ff.xul                               (resources/content/tasksOverlay-ff.xul)
+  content/inspector/tasksOverlay-sb.xul                               (resources/content/tasksOverlay-sb.xul)
   content/inspector/tasksOverlay-tb.xul                               (resources/content/tasksOverlay-tb.xul)
   content/inspector/editingOverlay.xul                                (resources/content/editingOverlay.xul)
   content/inspector/utilWindow.xul                                    (resources/content/utilWindow.xul)