diff --git a/calendar/lightning/lightning-packager.mk b/calendar/lightning/lightning-packager.mk
index 81793cc988..11883b3139 100644
--- a/calendar/lightning/lightning-packager.mk
+++ b/calendar/lightning/lightning-packager.mk
@@ -164,9 +164,14 @@ UPLOAD_FILES = \
   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))
diff --git a/mail/build.mk b/mail/build.mk
index a407ffb624..6684311e0e 100644
--- a/mail/build.mk
+++ b/mail/build.mk
@@ -91,6 +91,9 @@ 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
diff --git a/mozconfig-extra b/mozconfig-extra
new file mode 100644
index 0000000000..9857f88272
--- /dev/null
+++ b/mozconfig-extra
@@ -0,0 +1 @@
+ac_add_options --enable-calendar