--- a/.gecko_rev.yml
+++ b/.gecko_rev.yml
@@ -1,12 +1,12 @@
 ---
 GECKO_BASE_REPOSITORY: https://hg.mozilla.org/mozilla-unified
-GECKO_HEAD_REPOSITORY: https://hg.mozilla.org/mozilla-central
-GECKO_HEAD_REF: default
+GECKO_HEAD_REPOSITORY: https://hg.mozilla.org/try
+GECKO_HEAD_REF: ca0df3ce29bf4ced015d07cdbf1e90de6cdfb7b5
 
 ### For comm-central
 # GECKO_BASE_REPOSITORY: https://hg.mozilla.org/mozilla-unified
 # GECKO_HEAD_REPOSITORY: https://hg.mozilla.org/mozilla-central
 # GECKO_HEAD_REF: default
 #
 ### For branches
 # GECKO_BASE_REPOSITORY: https://hg.mozilla.org/mozilla-unified

--- a/calendar/lightning/Makefile.in
+++ b/calendar/lightning/Makefile.in
@@ -1,19 +1,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# Calendar builders currently use STRIP_XPI to reduce the binary component in
-# Lightning.
-
+XPI_NAME = lightning
 XPI_PKGNAME = lightning-$(LIGHTNING_VERSION).$(AB_CD)
-XPI_VERSION = $(LIGHTNING_VERSION)
-
 XPI_EM_ID = {e2fda1a4-762b-4020-b5ad-a41df1933103}
+XPI_INSTALL_EXTENSION = $(XPI_EM_ID)
 
 ifneq (,$(findstring a,$(LIGHTNING_VERSION)))
 DEFINES += -DLIGHTNING_PRERELEASE_VERSION=1
 endif
 
 # Gecko milestone
 GRE_MILESTONE = $(shell $(PYTHON) $(moztopsrcdir)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build Milestone)
 ifdef GRE_MILESTONE
@@ -51,22 +48,11 @@ DEFINES += -DTHUNDERBIRD_VERSION=$(THUND
            $(NULL)
 
 MOZ_BUILDID = $(shell $(PYTHON) $(moztopsrcdir)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID)
 DEFINES += -DMOZ_BUILDID=$(MOZ_BUILDID)
 
 LOCALE_TOPDIR=$(commtopsrcdir)
 LOCALE_RELATIVEDIR=calendar/lightning
 
-include $(moztopsrcdir)/config/rules.mk
+include $(srcdir)/lightning-packager.mk
 include $(srcdir)/versions.mk
 include $(srcdir)/lightning-tests.mk
-
-ident:
-	@printf 'comm_revision '
-	@$(PYTHON) $(moztopsrcdir)/config/printconfigsetting.py \
-	    $(FINAL_TARGET)/app.ini App SourceStamp
-	@printf 'moz_revision '
-	@$(PYTHON) $(moztopsrcdir)/config/printconfigsetting.py \
-	    $(FINAL_TARGET)/app.ini Build SourceStamp
-	@printf 'buildid '
-	@$(PYTHON) $(moztopsrcdir)/config/printconfigsetting.py \
-	    $(FINAL_TARGET)/app.ini App BuildID

--- a/calendar/lightning/moz.build
+++ b/calendar/lightning/moz.build
@@ -1,32 +1,29 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+XPI_NAME = 'lightning'
+export('XPI_NAME')
+
 DIRS += [
     '../libical',
     '../base',
     '../providers',
     '../import-export',
     '../itip',
     'components',
     '../locales',
     'modules',
 ]
 
 TEST_DIRS += ['../test']
 
-if CONFIG['NIGHTLY_BUILD']:
-    DIST_SUBDIR = 'extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}'
-else:
-    DIST_SUBDIR = 'distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}'
-export('DIST_SUBDIR')
-
 FINAL_TARGET_PP_FILES += [
     'app.ini',
     'manifest.json',
 ]
 
 JAR_MANIFESTS += ['jar.mn']
 
 USE_EXTENSION_MANIFEST = True

--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@@ -62,20 +62,22 @@ include $(moztopsrcdir)/config/rules.mk
 
 ifeq ($(OS_ARCH),WINNT)
 
 $(RESFILE): embedded-icons
 
 endif
 
 ifneq ($(OS_ARCH),WINNT)
+ifndef MOZ_ARTIFACT_BUILDS
 libs::
 	cp -p $(DIST)/bin/$(MOZ_APP_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
 
 GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, all.js all-thunderbird.js mailnews.js)
+endif # ! MOZ_ARTIFACT_BUILDS
 endif # ! WinNT
 
 ifneq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
 ICON_SUFFIX=.ico
 
 DESKTOP_ICONS = \
 	abcardWindow \
 	addressbookWindow \
@@ -130,27 +132,31 @@ LPROJ_ROOT := $(subst -,_,$(AB_CD))
 else
 LPROJ_ROOT := $(firstword $(subst -, ,$(AB_CD)))
 endif
 LPROJ := Contents/Resources/$(LPROJ_ROOT).lproj
 
 clean clobber repackage::
 	$(RM) -r '$(DIST)/$(MOZ_MACBUNDLE_NAME)'
 
-tools repackage:: $(PROGRAM)
+MAC_BUNDLE_VERSION = $(shell $(PYTHON) $(srcdir)/macversion.py --version=$(MOZ_APP_VERSION) --buildid=$(DEPTH)/buildid.h)
+
+.PHONY: repackage
+tools repackage:: $(DIST)/bin/$(MOZ_APP_NAME)
+	rm -rf '$(DIST)/$(MOZ_MACBUNDLE_NAME)'
 	$(MKDIR) -p '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS'
 	rsync -a --exclude '*.in' $(srcdir)/macbuild/Contents '$(DIST)/$(MOZ_MACBUNDLE_NAME)' --exclude English.lproj
 	$(MKDIR) -p '$(DIST)/$(MOZ_MACBUNDLE_NAME)/$(LPROJ)'
 	rsync -a --exclude '*.in' $(srcdir)/macbuild/Contents/Resources/English.lproj/ '$(DIST)/$(MOZ_MACBUNDLE_NAME)/$(LPROJ)'
 	sed -e 's/%APP_VERSION%/$(MOZ_APP_VERSION)/' -e 's/%MAC_APP_NAME%/$(MAC_APP_NAME)/' -e 's/%LOWER_MAC_APP_NAME%/$(LOWER_MAC_APP_NAME)/' $(srcdir)/macbuild/Contents/Info.plist.in > '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Info.plist'
 	sed -e 's/%MAC_APP_NAME%/$(MAC_APP_NAME)/' $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > '$(DIST)/$(MOZ_MACBUNDLE_NAME)/$(LPROJ)/InfoPlist.strings'
 	rsync -a --exclude-from='$(srcdir)/macbuild/Contents/MacOS-files.in' $(DIST)/bin/ '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources'
 	rsync -a --include-from='$(srcdir)/macbuild/Contents/MacOS-files.in' --exclude '*' $(DIST)/bin/ '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS'
-	$(RM) '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/$(PROGRAM)'
-	rsync -aL $(PROGRAM) '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS'
+	$(RM) '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/$(MOZ_APP_NAME)'
+	rsync -aL $(DIST)/bin/$(MOZ_APP_NAME) '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS'
 	$(MKDIR) -p '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Library/Spotlight'
 	rsync -a --copy-unsafe-links $(DIST)/package/thunderbird.mdimporter '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Library/Spotlight'
 	cp -RL $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/thunderbird.icns '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/thunderbird.icns'
 	$(MKDIR) -p '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Library/LaunchServices'
 ifdef MOZ_UPDATER
 	mv -f '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/updater.app/Contents/MacOS/org.mozilla.updater' '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Library/LaunchServices'
 	ln -s ../../../../Library/LaunchServices/org.mozilla.updater '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/updater.app/Contents/MacOS/org.mozilla.updater'
 endif

new file mode 100644
--- /dev/null
+++ b/mail/config/mozconfigs/linux64/artifact
@@ -0,0 +1,15 @@
+. "$topsrcdir/build/unix/mozconfig.linux"
+. "$topsrcdir/build/mozconfig.stylo"
+. "$topsrcdir/comm/mail/config/mozconfigs/common"
+
+ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
+ac_add_options --enable-profiling
+
+. "$topsrcdir/build/mozconfig.artifact.automation"
+. "$topsrcdir/build/mozconfig.artifact"
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# Disable enforcing that add-ons are signed by the trusted root
+MOZ_REQUIRE_ADDON_SIGNING=0

new file mode 100644
--- /dev/null
+++ b/mail/config/mozconfigs/macosx64/artifact
@@ -0,0 +1,16 @@
+. "$topsrcdir/build/macosx/mozconfig.common"
+. "$topsrcdir/build/mozconfig.stylo"
+. "$topsrcdir/comm/mail/config/mozconfigs/common"
+
+ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
+ac_add_options --disable-install-strip
+ac_add_options --enable-profiling
+
+. "$topsrcdir/build/mozconfig.artifact.automation"
+. "$topsrcdir/build/mozconfig.artifact"
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# Disable enforcing that add-ons are signed by the trusted root
+MOZ_REQUIRE_ADDON_SIGNING=0

new file mode 100644
--- /dev/null
+++ b/mail/config/mozconfigs/win64/artifact
@@ -0,0 +1,18 @@
+. "$topsrcdir/build/mozconfig.win-common"
+. "$topsrcdir/build/mozconfig.common"
+. "$topsrcdir/build/mozconfig.stylo"
+. "$topsrcdir/comm/mail/config/mozconfigs/common"
+. "$topsrcdir/comm/mail/config/mozconfigs/win64/common-win64"
+
+ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
+ac_add_options --enable-profiling
+ac_add_options --disable-mapi
+
+. "$topsrcdir/build/mozconfig.artifact.automation"
+. "$topsrcdir/build/mozconfig.artifact"
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# Disable enforcing that add-ons are signed by the trusted root
+MOZ_REQUIRE_ADDON_SIGNING=0

--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -543,8 +543,13 @@
 #endif
 
 ; [ Ping Sender ]
 ;
 @BINPATH@/pingsender@BIN_SUFFIX@
 
 ; Shutdown Terminator
 @RESPATH@/components/terminator.manifest
+
+#ifdef XP_WIN
+@BINPATH@/msvcp140.dll
+@BINPATH@/vcruntime140.dll
+#endif

--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -16,16 +16,17 @@ linux64/opt:
         actions: [build, check-test]
         config-paths:
             - comm/mozharness
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/releng_base_linux_64_builds.py
         script: "mozharness/scripts/fx_desktop_build.py"
         need-xvfb: true
+        mozconfig-variant: artifact
     toolchains:
         - linux64-binutils
         - linux64-cbindgen
         - linux64-clang
         - linux64-nasm
         - linux64-node
         - linux64-rust
         - linux64-sccache

--- a/taskcluster/ci/build/macosx.yml
+++ b/taskcluster/ci/build/macosx.yml
@@ -59,16 +59,17 @@ macosx64/opt:
         actions: [build]
         config-paths:
             - comm/mozharness
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/releng_base_mac_64_cross_builds.py
         script: "mozharness/scripts/fx_desktop_build.py"
         tooltool-downloads: internal
+        mozconfig-variant: artifact
     toolchains:
         - linux64-cbindgen
         - linux64-cctools-port
         - linux64-clang
         - linux64-hfsplus
         - linux64-libdmg
         - linux64-llvm-dsymutil
         - linux64-nasm

--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -127,16 +127,17 @@ win64/opt:
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win64.py
         extra-config:
             stage_platform: win64
+        mozconfig-variant: artifact
     toolchains:
         - win64-cbindgen
         - win64-clang-cl
         - win64-nasm
         - win64-node
         - win64-rust
         - win64-sccache