diff --git a/docker/wine/Dockerfile b/docker/wine/Dockerfile
index 6967f5c7796..857681e1d24 100644
--- a/docker/wine/Dockerfile
+++ b/docker/wine/Dockerfile
@@ -1,13 +1,7 @@
 FROM electronuserland/electron-builder:latest
 
-# libgnome-keyring-dev — to build keytar
-RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys F9CB8DB0 && \
-echo "deb http://ppa.launchpad.net/ubuntu-wine/ppa/ubuntu xenial main " | tee /etc/apt/sources.list.d/wine.list && \
-dpkg --add-architecture i386 && \
-apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \
-echo "deb http://download.mono-project.com/repo/debian wheezy main" | tee /etc/apt/sources.list.d/mono-xamarin.list && \
-apt-get update -y && \
-apt-get install -y --no-install-recommends wine1.8 mono-devel ca-certificates-mono && \
+RUN apt-get update -y && \
+apt-get install -y --no-install-recommends wine-stable mono-devel ca-certificates-mono && \
 apt-get clean && rm -rf /var/lib/apt/lists/*
 
 ENV WINEDEBUG -all,err+all
diff --git a/docs/Options.md b/docs/Options.md
index d0b2da91bde..2d325a1656d 100644
--- a/docs/Options.md
+++ b/docs/Options.md
@@ -282,7 +282,7 @@ Amazon S3 — `https` must be used, so, if you use direct Amazon S3 endpoints, f
 | summary | <a name="SnapOptions-summary"></a>The 78 character long summary. Defaults to [productName](#AppMetadata-productName).
 | grade | <a name="SnapOptions-grade"></a><p>The quality grade of the snap. It can be either <code>devel</code> (i.e. a development version of the snap, so not to be published to the “stable” or “candidate” channels) or “stable” (i.e. a stable release or release candidate, which can be released to all channels). Defaults to <code>stable</code>.</p>
 | assumes | <a name="SnapOptions-assumes"></a>The list of features that must be supported by the core in order for this snap to install.
-| stagePackages | <a name="SnapOptions-stagePackages"></a><p>The list of Ubuntu packages to use that are needed to support the <code>app</code> part creation. Like <code>depends</code> for <code>deb</code>. Defaults to <code>[&quot;libnotify4&quot;, &quot;libappindicator1&quot;, &quot;libxtst6&quot;, &quot;libnss3&quot;, &quot;fontconfig-config&quot;]</code>.</p>
+| stagePackages | <a name="SnapOptions-stagePackages"></a><p>The list of Ubuntu packages to use that are needed to support the <code>app</code> part creation. Like <code>depends</code> for <code>deb</code>. Defaults to <code>[&quot;libnotify4&quot;, &quot;libappindicator1&quot;, &quot;libxtst6&quot;, &quot;libnss3&quot;, &quot;libxss1&quot;, &quot;fontconfig-config&quot;, &quot;gconf2&quot;, &quot;libasound2&quot;]</code>.</p>
 | ubuntuAppPlatformContent | <a name="SnapOptions-ubuntuAppPlatformContent"></a><p>Specify <code>ubuntu-app-platform1</code> to use [ubuntu-app-platform](https://insights.ubuntu.com/2016/11/17/how-to-create-snap-packages-on-qt-applications/). Snap size will be greatly reduced, but it is not recommended for now because “the snaps must be connected before running uitk-gallery for the first time”.</p>
 
 <a name="SquirrelWindowsOptions"></a>
diff --git a/nsis-auto-updater/README.md b/nsis-auto-updater/README.md
index d7f9fcf93a0..573a208b193 100644
--- a/nsis-auto-updater/README.md
+++ b/nsis-auto-updater/README.md
@@ -1 +1 @@
-See wiki soon.
\ No newline at end of file
+[Auto Update](https://github.com/electron-userland/electron-builder/wiki/Auto-Update).
\ No newline at end of file
diff --git a/src/targets/appImage.ts b/src/targets/appImage.ts
index cc502539458..3744d4e5193 100644
--- a/src/targets/appImage.ts
+++ b/src/targets/appImage.ts
@@ -71,7 +71,7 @@ export default class AppImageTarget extends Target {
       return
     }
 
-    await exec(process.arch === "x64" ? path.join(appImagePath, "xorriso") : "xorriso", args)
+    await exec(process.arch !== "x64" || (process.env.USE_SYSTEM_XORRISO === "true" || process.env.USE_SYSTEM_XORRISO === "") ? "xorriso" : path.join(appImagePath, "xorriso"), args)
 
     await new BluebirdPromise((resolve, reject) => {
       const rd = createReadStream(path.join(appImagePath, arch === Arch.ia32 ? "32" : "64", "runtime"))