diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..f3cfcdcf4
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,30 @@
+matrix:
+  include:
+    - os: osx
+      osx_image: xcode9.3
+      language: node_js
+      node_js: '8'
+
+    - os: linux
+      language: node_js
+      node_js: '8'
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - libx11-dev
+            - zlib1g-dev
+            - libpng12-dev
+            - libxtst-dev
+            - g++-4.8
+            - gcc-4.8
+
+cache:
+  directories:
+    - node_modules
+    - $HOME/.cache/electron
+    - $HOME/.cache/electron-builder
+
+script:
+  - npm run dist
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 000000000..433c9a5e0
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,15 @@
+image: Visual Studio 2017
+
+platform:
+  - x64
+
+cache:
+  - node_modules
+  - '%USERPROFILE%\.electron'
+
+install:
+  - ps: Install-Product node 8 x64
+  - npm install
+
+build_script:
+  - npm run dist
\ No newline at end of file
diff --git a/package.json b/package.json
index 176d5b5a4..aad947f02 100644
--- a/package.json
+++ b/package.json
@@ -24,32 +24,34 @@
       "!main.js"
     ],
     "mac": {
-      "artifactName": "${productName}-${version}-${arch}.${ext}",
+      "artifactName": "jitsi-meet-${version}.${ext}",
       "category": "public.app-category.video",
       "target": "dmg"
     },
     "linux": {
-      "artifactName": "${productName}-${version}-${arch}.${ext}",
+      "artifactName": "jitsi-meet-${version}-${arch}.${ext}",
       "category": "VideoConference;AudioVideo;Audio;Video;Network",
       "description": "Jitsi Meet Desktop App",
       "executableName": "jitsi-meet",
-      "target": "AppImage"
+      "target": [
+        {
+          "arch": "x64",
+          "target": "AppImage"
+        }
+      ]
     },
     "win": {
+      "artifactName": "jitsi-meet-${version}-${arch}.${ext}",
       "target": [
         {
           "arch": [
-            "x64",
-            "ia32"
+            "ia32",
+            "x64"
           ],
           "target": "nsis"
         }
       ]
     },
-    "nsis": {
-      "allowToChangeInstallationDirectory": true,
-      "oneClick": false
-    },
     "directories": {
       "buildResources": "resources"
     }