diff --git a/app/build/tasks/create-mac-dmg.js b/app/build/tasks/create-mac-dmg.js
index bdee706d0..89315af97 100644
--- a/app/build/tasks/create-mac-dmg.js
+++ b/app/build/tasks/create-mac-dmg.js
@@ -6,7 +6,11 @@ module.exports = grunt => {
     const done = this.async();
     const dmgPath = path.join(grunt.config('outputDir'), 'Mailspring.dmg');
     createDMG({
-      appPath: path.join(grunt.config('outputDir'), 'Mailspring-darwin-x64', 'Mailspring.app'),
+      appPath: path.join(
+        grunt.config('outputDir'),
+        `Mailspring-darwin-${process.arch}`,
+        'Mailspring.app'
+      ),
       name: 'Mailspring',
       background: path.resolve(
         grunt.config('appDir'),
diff --git a/app/build/tasks/create-mac-zip.js b/app/build/tasks/create-mac-zip.js
index 6dfae8ec9..bb898c716 100644
--- a/app/build/tasks/create-mac-zip.js
+++ b/app/build/tasks/create-mac-zip.js
@@ -15,7 +15,7 @@ module.exports = grunt => {
     }
 
     const orig = process.cwd();
-    process.chdir(path.join(grunt.config('outputDir'), 'Mailspring-darwin-x64'));
+    process.chdir(path.join(grunt.config('outputDir'), `Mailspring-darwin-${process.arch}`));
 
     spawn(
       {
diff --git a/app/package-lock.json b/app/package-lock.json
index 16180e683..1203ad961 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "mailspring",
-  "version": "1.10.3",
+  "version": "1.10.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "mailspring",
-      "version": "1.10.3",
+      "version": "1.10.4",
       "license": "GPL-3.0",
       "dependencies": {
         "@bengotow/slate-edit-list": "github:bengotow/slate-edit-list#b868e108",
diff --git a/scripts/postinstall.js b/scripts/postinstall.js
index 09b546267..17ec022df 100644
--- a/scripts/postinstall.js
+++ b/scripts/postinstall.js
@@ -18,7 +18,7 @@ const npmEnvs = {
     npm_config_target: npmElectronTarget,
     npm_config_arch: process.arch,
     npm_config_target_arch: process.arch,
-    npm_config_disturl: 'https://atom.io/download/electron',
+    npm_config_disturl: 'https://electronjs.org/headers',
     npm_config_runtime: 'electron',
     npm_config_build_from_source: true,
   }),