diff --git a/app/bin/build.js b/app/bin/build.js
index 30d6be8..9fcdba0 100644
--- a/app/bin/build.js
+++ b/app/bin/build.js
@@ -111,7 +111,13 @@ async function build () {
           , spawnOptions);
 
     // Move tsc output to build dir
-    fs.moveSync(path.join(BUILD_PATH, "src"), BUILD_PATH);
+    if (process.platform === "linux") {
+        // Quick workaround for issue on linux
+        spawnSync("mv", [ path.join(BUILD_PATH, "src/*"), BUILD_PATH ]
+              , spawnOptions);
+    } else {
+        fs.moveSync(path.join(BUILD_PATH, "src"), BUILD_PATH);
+    }
 
     // Copy other files
     fs.copySync(SRC_PATH, BUILD_PATH, {
diff --git a/app/bin/install-manifest.js b/app/bin/install-manifest.js
index 5744434..daab793 100644
--- a/app/bin/install-manifest.js
+++ b/app/bin/install-manifest.js
@@ -32,7 +32,9 @@ switch (platform) {
     case "darwin":
     case "linux": {
         // Manifest location within home directory
-        const destination = path.join(os.homedir(), manifestPath[platform]);
+        const destination = path.join(os.homedir(), platform === "linux"
+            ? ".mozilla/native-messaging-hosts/"
+            : manifestPath[platform]);
 
         if (argv.remove) {
             fs.remove(path.join(destination, manifestName));