diff --git a/mozilla/calendar/Makefile.in b/mozilla/calendar/Makefile.in
index 8d83fc9a006..04444a02515 100644
--- a/mozilla/calendar/Makefile.in
+++ b/mozilla/calendar/Makefile.in
@@ -42,7 +42,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE	= calendar
-DIRS = libical resources base providers import-export locales timezones
+DIRS = libical resources base providers import-export locales
 
 ifdef ENABLE_TESTS
 DIRS += test
diff --git a/mozilla/calendar/installer/windows/packages-static b/mozilla/calendar/installer/windows/packages-static
index 6a037c1276b..02f3b46fc83 100644
--- a/mozilla/calendar/installer/windows/packages-static
+++ b/mozilla/calendar/installer/windows/packages-static
@@ -304,7 +304,8 @@ bin\chrome\icons\default\calendar-alarm-dialog.ico
 bin\extensions\calendar-timezones@mozilla.org\install.rdf
 bin\extensions\calendar-timezones@mozilla.org\timezones.sqlite
 bin\extensions\calendar-timezones@mozilla.org\chrome.manifest
-bin\extensions\calendar-timezones@mozilla.org\chrome\*
+bin\extensions\calendar-timezones@mozilla.org\chrome\calendar-timezones-@AB_CD@.jar
+bin\extensions\calendar-timezones@mozilla.org\chrome\chromelist.txt
 bin\extensions\calendar-timezones@mozilla.org\defaults\preferences\preferences.js
 
 ; [Default Preferences]
diff --git a/mozilla/calendar/locales/Makefile.in b/mozilla/calendar/locales/Makefile.in
index 84c9cca148b..0dd110487e1 100644
--- a/mozilla/calendar/locales/Makefile.in
+++ b/mozilla/calendar/locales/Makefile.in
@@ -45,6 +45,8 @@ relativesrcdir  = calendar/locales
 
 include $(DEPTH)/config/autoconf.mk
 
+DIRS = ../timezones
+
 include $(topsrcdir)/config/config.mk
 
 run_for_effects := $(shell if ! test -d $(DIST); then $(NSINSTALL) -D $(DIST); fi; if ! test -d $(DIST)/branding; then $(NSINSTALL) -D $(DIST)/branding; fi)
@@ -123,9 +125,14 @@ endif
 	$(CYGWIN_WRAPPER) 7z x -ol10n-stage $(WIN32_INSTALLER_IN)
 	$(RM) -r l10n-stage/localized
 	$(RM) l10n-stage/setup.exe
+	$(RM) -r l10n-stage/nonlocalized/extensions/calendar-timezones@mozilla.org/chrome
 	$(RM) -rf $(DIST)/xpi-stage/locale-$(AB_CD)
+	$(RM) -rf $(DIST)/xpi-stage/calendar-timezones
 	$(MAKE) libs-$(AB_CD)
+	$(MAKE) -C ../timezones libs-$(AB_CD)
 	mv $(DIST)/xpi-stage/locale-$(AB_CD) l10n-stage/localized
+	mv $(DIST)/xpi-stage/calendar-timezones/chrome l10n-stage/nonlocalized/extensions/calendar-timezones@mozilla.org
+	mv $(DIST)/xpi-stage/calendar-timezones/chrome.manifest l10n-stage/nonlocalized/extensions/calendar-timezones@mozilla.org
 	$(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen l10ngen/setup.exe l10ngen/7zSD.sfx
 	cp ../installer/windows/l10ngen/setup.exe l10n-stage
 	$(NSINSTALL) -D l10n-stage/localized/uninstall
@@ -160,11 +167,15 @@ repackage-zip: $(ZIP_IN)
 	  $(STAGEDIST)/chrome/calendar-en-US.jar \
 	  $(STAGEDIST)/chrome/calendar-en-US.manifest \
 	  $(STAGEDIST)/defaults/pref/sunbird-l10n.js
+	$(RM) -rf $(STAGEDIST)/extensions/calendar-timezones@mozilla.org/chrome
+	$(RM) $(STAGEDIST)/extensions/calendar-timezones@mozilla.org/chrome.manifest
 	$(RM) -r $(STAGEDIST)/defaults/profile \
 	  $(STAGEDIST)/chrome/en-US \
 	  $(STAGEDIST)/chrome/calendar-en-US
 	$(RM) -rf $(DIST)/xpi-stage/locale-$(AB_CD)
+	$(RM) -rf $(DIST)/xpi-stage/calendar-timezones
 	$(MAKE) libs-$(AB_CD)
+	$(MAKE) -C ../timezones libs-$(AB_CD)
 ifeq (WINNT,$(OS_ARCH))
 	$(RM) -r $(STAGEDIST)/uninstall
 	$(NSINSTALL) -D $(STAGEDIST)/uninstall
@@ -173,6 +184,8 @@ endif
 	$(RM) -r $(DIST)/xpi-stage/locale-$(AB_CD)/chrome/$(AB_CD)
 	cd $(DIST)/xpi-stage/locale-$(AB_CD) && \
 	  tar $(TAR_CREATE_FLAGS) - * | ( cd $(STAGEDIST) && tar -xf - )
+	cd $(DIST)/xpi-stage/calendar-timezones && \
+	  tar $(TAR_CREATE_FLAGS) - * | ( cd $(STAGEDIST)/extensions/calendar-timezones@mozilla.org && tar -xf - )
 ifneq (en,$(AB))
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 	mv $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/Resources/en.lproj $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/Resources/$(AB).lproj