diff --git a/.idea/typescript-compiler.xml b/.idea/typescript-compiler.xml
index 498a6a21392..c3d4bcaacbb 100644
--- a/.idea/typescript-compiler.xml
+++ b/.idea/typescript-compiler.xml
@@ -3,6 +3,7 @@
   <component name="TypeScriptCompiler">
     <option name="isCompilerEnabled" value="true" />
     <option name="typeScriptServiceDirectory" value="$PROJECT_DIR$/node_modules/typescript/lib" />
+    <option name="trackFileSystemChanges" value="false" />
     <option name="useConfig" value="true" />
     <option name="useService" value="true" />
     <option name="versionType" value="SERVICE_DIRECTORY" />
diff --git a/README.md b/README.md
index a9646279d89..56be9b6dbe0 100755
--- a/README.md
+++ b/README.md
@@ -14,7 +14,6 @@ Complete solution to package and build ready for distribution and "auto update"
   * [Windows](https://github.com/electron-userland/electron-builder/wiki/Options#WinBuildOptions-target): NSIS, Squirrel.Windows.
 * [Publishing artifacts to GitHub Releases](https://github.com/electron-userland/electron-builder/wiki/Publishing-Artifacts).
 
-[electron-packager](https://github.com/electron-userland/electron-packager) and
 [appdmg](https://github.com/LinusU/node-appdmg) are used under the hood.
 
 _Note: `appdmg` (and the platform specific `7zip-bin-*` packages) are `optionalDependencies`, which may require manual install if you have npm configured to [not install optional deps by default](https://docs.npmjs.com/misc/config#optional)._
diff --git a/package.json b/package.json
index 63e24b12a6a..fbef3585e27 100644
--- a/package.json
+++ b/package.json
@@ -118,7 +118,7 @@
     "diff": "^2.2.3",
     "json8": "^0.9.0",
     "pre-git": "^3.10.0",
-    "should": "^9.0.2",
+    "should": "^10.0.0",
     "ts-babel": "^1.0.3",
     "tslint": "3.13.0",
     "typescript": "^2.1.0-dev.20160712",
diff --git a/src/platformPackager.ts b/src/platformPackager.ts
index 1c9ae630776..fae9cb89216 100644
--- a/src/platformPackager.ts
+++ b/src/platformPackager.ts
@@ -1,4 +1,4 @@
-import { AppMetadata, DevMetadata, Platform, PlatformSpecificBuildOptions, Arch, archToString } from "./metadata"
+import { AppMetadata, DevMetadata, Platform, PlatformSpecificBuildOptions, Arch } from "./metadata"
 import EventEmitter = NodeJS.EventEmitter
 import { Promise as BluebirdPromise } from "bluebird"
 import * as path from "path"
@@ -212,8 +212,8 @@ export abstract class PlatformPackager<DC extends PlatformSpecificBuildOptions>
 
       await BluebirdPromise.all(promises)
     }
-    await task(`Packaging for platform ${this.platform.name} ${archToString(arch)} using electron ${this.info.electronVersion} to ${path.relative(this.projectDir, appOutDir)}`,
-      pack(options, appOutDir, platformName, archToString(arch), this.info.electronVersion))
+    await task(`Packaging for platform ${this.platform.name} ${Arch[arch]} using electron ${this.info.electronVersion} to ${path.relative(this.projectDir, appOutDir)}`,
+      pack(options, appOutDir, platformName, Arch[arch], this.info.electronVersion))
 
     await this.doCopyExtraFiles(true, appOutDir, arch, platformSpecificBuildOptions)
     await this.doCopyExtraFiles(false, appOutDir, arch, platformSpecificBuildOptions)
@@ -375,16 +375,12 @@ export abstract class PlatformPackager<DC extends PlatformSpecificBuildOptions>
     return archiveApp(this.devMetadata.build.compression, format, outFile, this.platform === Platform.MAC ? path.join(appOutDir, `${this.appInfo.productFilename}.app`) : appOutDir)
   }
 
-  generateName(ext: string | null, arch: Arch, deployment: boolean): string {
-    return this.generateName2(ext, arch === Arch.x64 ? null : Arch[arch], deployment)
-  }
-
-  generateName1(ext: string | null, arch: Arch, classifier: string, deployment: boolean): string {
-    let c = arch === Arch.x64 ? null : Arch[arch]
+  generateName(ext: string | null, arch: Arch, deployment: boolean, classifier: string | null = null): string {
+    let c = arch === Arch.x64 ? (ext === "AppImage" ? "x86_64" : null) : Arch[arch]
     if (c == null) {
       c = classifier
     }
-    else {
+    else if (classifier != null) {
       c += `-${classifier}`
     }
     return this.generateName2(ext, c, deployment)
diff --git a/src/targets/nsis.ts b/src/targets/nsis.ts
index d2125f161b8..f9ea018280b 100644
--- a/src/targets/nsis.ts
+++ b/src/targets/nsis.ts
@@ -1,5 +1,5 @@
 import { WinPackager } from "../winPackager"
-import { Arch, NsisOptions, archToString } from "../metadata"
+import { Arch, NsisOptions } from "../metadata"
 import { debug, doSpawn, handleProcess } from "../util/util"
 import * as path from "path"
 import { Promise as BluebirdPromise } from "bluebird"
@@ -36,7 +36,7 @@ export default class NsisTarget extends Target {
 
   async build(arch: Arch, appOutDir: string) {
     const packager = this.packager
-    const archSuffix = archToString(arch)
+    const archSuffix = Arch[arch]
     const archiveFile = path.join(this.outDir, `${packager.appInfo.name}-${packager.appInfo.version}-${archSuffix}.nsis.7z`)
     this.archs.set(arch, task(`Creating NSIS ${archSuffix} package`, archiveApp(packager.devMetadata.build.compression, "7z", archiveFile, appOutDir, true)))
   }
diff --git a/src/winPackager.ts b/src/winPackager.ts
index e5ad3fa8add..3f2f4c22533 100644
--- a/src/winPackager.ts
+++ b/src/winPackager.ts
@@ -143,9 +143,9 @@ export class WinPackager extends PlatformPackager<WinBuildOptions> {
         const format = target.name
         log(`Creating Windows ${format}`)
         // we use app name here - see https://github.com/electron-userland/electron-builder/pull/204
-        const outFile = path.join(outDir, this.generateName1(format, arch, "win", false))
+        const outFile = path.join(outDir, this.generateName(format, arch, false, "win"))
         promises.push(this.archiveApp(format, appOutDir, outFile)
-          .then(() => this.dispatchArtifactCreated(outFile, this.generateName1(format, arch, "win", true))))
+          .then(() => this.dispatchArtifactCreated(outFile, this.generateName(format, arch, true, "win"))))
       }
     }
   }
diff --git a/test/src/helpers/packTester.ts b/test/src/helpers/packTester.ts
index 5d975238827..7ee41bc9061 100755
--- a/test/src/helpers/packTester.ts
+++ b/test/src/helpers/packTester.ts
@@ -129,25 +129,28 @@ async function packAndCheck(projectDir: string, packagerOptions: PackagerOptions
 }
 
 async function checkLinuxResult(projectDir: string, packager: Packager, checkOptions: AssertPackOptions, artifacts: Array<ArtifactCreated>, arch: Arch, nameToTarget: Map<String, Target>) {
+  const appInfo = packager.appInfo
+
   function getExpected(): Array<string> {
     const result: Array<string> = []
     for (let target of nameToTarget.keys()) {
-      result.push(`TestApp-${packager.appInfo.version}${target === "appimage" ? "" : `.${target}`}`)
+      if (target === "appimage") {
+        result.push(`${appInfo.productFilename}-${appInfo.version}-${arch === Arch.x64 ? "x86_64" : Arch[arch]}.AppImage`)
+      }
+      else {
+        result.push(`TestApp-${appInfo.version}.${target}`)
+      }
     }
     return result
   }
 
-  if (nameToTarget.has("appimage")) {
-    return
-  }
-
   assertThat(getFileNames(artifacts)).containsAll(getExpected())
 
   if (!nameToTarget.has("deb")) {
     return
   }
 
-  const productFilename = packager.appInfo.productFilename
+  const productFilename = appInfo.productFilename
   const expectedContents = pathSorter(expectedLinuxContents.map(it => {
     if (it === "/opt/TestApp/TestApp") {
       return "/opt/" + productFilename + "/" + productFilename
@@ -163,10 +166,10 @@ async function checkLinuxResult(projectDir: string, packager: Packager, checkOpt
   // console.log(JSON.stringify(await getContents(projectDir + "/dist/TestApp-1.0.0-amd64.deb", productName), null, 2))
   // console.log(JSON.stringify(await getContents(projectDir + "/dist/TestApp-1.0.0-i386.deb", productName), null, 2))
 
-  const packageFile = `${projectDir}/${outDirName}/TestApp-${packager.appInfo.version}.deb`
+  const packageFile = `${projectDir}/${outDirName}/TestApp-${appInfo.version}.deb`
   assertThat(await getContents(packageFile)).isEqualTo(expectedContents)
   if (arch === Arch.ia32) {
-    assertThat(await getContents(`${projectDir}/${outDirName}/TestApp-${packager.appInfo.version}-i386.deb`)).isEqualTo(expectedContents)
+    assertThat(await getContents(`${projectDir}/${outDirName}/TestApp-${appInfo.version}-i386.deb`)).isEqualTo(expectedContents)
   }
 
   assertThat2(parseDebControl(await exec("dpkg", ["--info", packageFile]))).has.properties({