diff --git a/.gitattributes b/.gitattributes
index 59597f670d..4fb3d77151 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,3 +2,4 @@
 app/win/zotero.exe.tar.xz filter=lfs diff=lfs merge=lfs -text
 app/mac/updater.tar.xz filter=lfs diff=lfs merge=lfs -text
 app/win/updater.exe.tar.xz filter=lfs diff=lfs merge=lfs -text
+app/linux/updater.tar.xz filter=lfs diff=lfs merge=lfs -text
diff --git a/app/build.sh b/app/build.sh
index 759396019a..da337ef1e9 100755
--- a/app/build.sh
+++ b/app/build.sh
@@ -855,7 +855,8 @@ if [ $BUILD_LINUX == 1 ]; then
 		cp "$CALLDIR/linux/set_launcher_icon" "$APPDIR"
 		
 		# Use our own updater, because Mozilla's requires updates signed by Mozilla
-		cp "$CALLDIR/linux/updater-$arch" "$APPDIR"/updater
+		tar xf "$CALLDIR/linux/updater.tar.xz" --to-stdout updater-$arch > "$APPDIR/updater"
+		chmod 755 "$APPDIR/updater"
 
 		# Copy app files
 		rsync -a "$base_dir/" "$APPDIR/"
diff --git a/app/linux/mozconfig b/app/linux/mozconfig
new file mode 100644
index 0000000000..8e7fa5cf88
--- /dev/null
+++ b/app/linux/mozconfig
@@ -0,0 +1,27 @@
+# Uncomment to build 32-bit
+#ac_add_options --target=i686
+
+ac_add_options --enable-bootstrap
+
+mk_add_options AUTOCLOBBER=1
+
+# These don't all affect the stub, but they can't hurt, and we'll want them if
+# we switch to custom XUL builds
+ac_add_options MOZ_ENABLE_JS_DUMP=1
+ac_add_options MOZ_ENABLE_FORKSERVER=
+ac_add_options MOZ_TELEMETRY_REPORTING=
+ac_add_options MOZ_DATA_REPORTING=
+ac_add_options --disable-tests
+ac_add_options --disable-debug
+ac_add_options --disable-debug-symbols
+ac_add_options --disable-webrtc
+ac_add_options --disable-eme
+
+export MOZILLA_OFFICIAL=1
+export RELEASE_OR_BETA=1
+MOZ_REQUIRE_SIGNING=
+
+ac_add_options --enable-official-branding
+
+# Build updater without MAR signature verification
+ac_add_options --disable-verify-mar
diff --git a/app/linux/updater-i686 b/app/linux/updater-i686
deleted file mode 100755
index 60fe8db563..0000000000
Binary files a/app/linux/updater-i686 and /dev/null differ
diff --git a/app/linux/updater-x86_64 b/app/linux/updater-x86_64
deleted file mode 100755
index 862b2cb286..0000000000
Binary files a/app/linux/updater-x86_64 and /dev/null differ
diff --git a/app/linux/updater.tar.xz b/app/linux/updater.tar.xz
new file mode 100644
index 0000000000..5df9e2da4c
--- /dev/null
+++ b/app/linux/updater.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d7e9c81d2f86ec0f70d75107a022649292889807bc8b0b7eaf1bdfd5c1030bf1
+size 74516