diff --git a/browser/installer/windows/Makefile.in b/browser/installer/windows/Makefile.in
index 8b05150fa84..51295945d15 100644
--- a/browser/installer/windows/Makefile.in
+++ b/browser/installer/windows/Makefile.in
@@ -24,6 +24,7 @@ INSTALLER_FILES = \
 	nsis/uninstaller.nsi \
 	nsis/stub.nsi \
 	nsis/shared.nsh \
+	stub.tag \
 	$(NULL)
 
 ifdef MOZ_MAINTENANCE_SERVICE
diff --git a/browser/installer/windows/nsis/stub.nsi b/browser/installer/windows/nsis/stub.nsi
index c8a6903fff9..846e01487f5 100644
--- a/browser/installer/windows/nsis/stub.nsi
+++ b/browser/installer/windows/nsis/stub.nsi
@@ -13,8 +13,7 @@
 !verbose 3
 
 SetDatablockOptimize on
-SetCompress force
-SetCompressor /FINAL /SOLID lzma
+SetCompress off
 CRCCheck on
 
 RequestExecutionLevel user
@@ -239,10 +238,10 @@ Var ControlRightPX
 !insertmacro UnloadUAC
 
 VIAddVersionKey "FileDescription" "${BrandShortName} Stub Installer"
-VIAddVersionKey "OriginalFilename" "stub.exe"
+VIAddVersionKey "OriginalFilename" "setup-stub.exe"
 
 Name "$BrandFullName"
-OutFile "stub.exe"
+OutFile "setup-stub.exe"
 icon "setup.ico"
 XPStyle on
 BrandingText " "
diff --git a/browser/installer/windows/stub.tag b/browser/installer/windows/stub.tag
new file mode 100644
index 00000000000..f32bef36e84
--- /dev/null
+++ b/browser/installer/windows/stub.tag
@@ -0,0 +1,4 @@
+;!@Install@!UTF-8!
+Title="Mozilla Firefox"
+RunProgram="setup-stub.exe"
+;!@InstallEnd@!
\ No newline at end of file
diff --git a/toolkit/mozapps/installer/windows/nsis/makensis.mk b/toolkit/mozapps/installer/windows/nsis/makensis.mk
index 40c4adafe00..095abd6f1c8 100644
--- a/toolkit/mozapps/installer/windows/nsis/makensis.mk
+++ b/toolkit/mozapps/installer/windows/nsis/makensis.mk
@@ -45,6 +45,12 @@ $(CONFIG_DIR)/setup.exe::
 	cd $(CONFIG_DIR) && $(MAKENSISU) installer.nsi
 ifdef MOZ_STUB_INSTALLER
 	cd $(CONFIG_DIR) && $(MAKENSISU) stub.nsi
+ifdef MOZ_EXTERNAL_SIGNING_FORMAT
+	$(MOZ_SIGN_CMD) $(foreach f,$(MOZ_EXTERNAL_SIGNING_FORMAT),-f $(f)) $(CONFIG_DIR)/setup-stub.exe
+endif
+	$(MAKE) $(CONFIG_DIR)/7zSD.sfx
+	cd $(CONFIG_DIR) &&  $(CYGWIN_WRAPPER) 7z a -t7z $(ABS_CONFIG_DIR)/stub.7z setup-stub.exe -mx -m0=BCJ2 -m1=LZMA:d21 -m2=LZMA:d17 -m3=LZMA:d17 -mb0:1 -mb0s1:2 -mb0s2:3
+	cat $(CONFIG_DIR)/7zSD.sfx $(CONFIG_DIR)/stub.tag $(CONFIG_DIR)/stub.7z > "$(CONFIG_DIR)/stub.exe"
 ifdef MOZ_EXTERNAL_SIGNING_FORMAT
 	$(MOZ_SIGN_CMD) $(foreach f,$(MOZ_EXTERNAL_SIGNING_FORMAT),-f $(f)) $(CONFIG_DIR)/stub.exe
 endif
@@ -62,7 +68,7 @@ $(CONFIG_DIR)/7zSD.sfx:
 
 installer::
 	$(INSTALL) $(CONFIG_DIR)/setup.exe $(DEPTH)/installer-stage
-	cd $(DEPTH)/installer-stage && $(CYGWIN_WRAPPER) 7z a -r -t7z $(ABS_CONFIG_DIR)/app.7z -mx -m0=BCJ2 -m1=LZMA:d24 -m2=LZMA:d19 -m3=LZMA:d19  -mb0:1 -mb0s1:2 -mb0s2:3
+	cd $(DEPTH)/installer-stage && $(CYGWIN_WRAPPER) 7z a -r -t7z $(ABS_CONFIG_DIR)/app.7z -mx -m0=BCJ2 -m1=LZMA:d24 -m2=LZMA:d19 -m3=LZMA:d19 -mb0:1 -mb0s1:2 -mb0s2:3
 	$(MAKE) $(CONFIG_DIR)/7zSD.sfx
 	$(NSINSTALL) -D $(DIST)/$(PKG_INST_PATH)
 	cat $(CONFIG_DIR)/7zSD.sfx $(CONFIG_DIR)/app.tag $(CONFIG_DIR)/app.7z > "$(DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe"