--- a/calendar/lightning/lightning-packager.mk
+++ b/calendar/lightning/lightning-packager.mk
@@ -159,14 +159,19 @@ repack-process-extrafiles:
 
 recreate-platformini: $(LIBXUL_DIST)/bin/platform.ini
 
 UPLOAD_FILES = \
   lightning.xpi \
   gdata-provider.xpi \
   $(NULL)
 
-upload:
+hack_l10n_upload:
+	[ -f $(DIST)/$(UNIVERSAL_PATH)xpi-stage/lighting-all.xpi ] && \
+	  cp -RL $(DIST)/$(UNIVERSAL_PATH)xpi-stage/lightning-all.xpi $(DIST)/$(MOZ_PKG_PLATFORM)/lightning.xpi || true
+
+stage_upload:
 	$(NSINSTALL) -D $(DIST)/$(MOZ_PKG_PLATFORM)
-	cp -RL $(DIST)/$(UNIVERSAL_PATH)xpi-stage/lightning-all.xpi $(DIST)/$(MOZ_PKG_PLATFORM)/lightning.xpi
-	$(INSTALL) $(IFLAGS1) $(DIST)/xpi-stage/gdata-provider.xpi $(DIST)/$(MOZ_PKG_PLATFORM)
+	$(INSTALL) $(IFLAGS1) $(addprefix $(DIST)/xpi-stage/,$(UPLOAD_FILES)) $(DIST)/$(MOZ_PKG_PLATFORM)
+
+upload: stage_upload hack_l10n_upload
 	$(PYTHON) $(MOZILLA_DIR)/build/upload.py --base-path $(DIST) \
 	  $(addprefix $(DIST)/$(MOZ_PKG_PLATFORM)/,$(UPLOAD_FILES))

--- a/mail/build.mk
+++ b/mail/build.mk
@@ -86,14 +86,17 @@ package-compare:
 install::
 	@$(MAKE) -C mail/installer install
 
 source-package::
 	@$(MAKE) -C mail/installer source-package
 
 upload::
 	@$(MAKE) -C mail/installer upload
+ifdef MOZ_CALENDAR
+	@$(MAKE) -C calendar/lightning upload
+endif
 
 ifdef ENABLE_TESTS
 include $(srcdir)/mail/testsuite-targets.mk
 endif
 
 endif # COMM_BUILD

new file mode 100644
--- /dev/null
+++ b/mozconfig-extra
@@ -0,0 +1,1 @@
+ac_add_options --enable-calendar