diff --git a/.travis.yml b/.travis.yml
index 78931d5d7..2ce86c9b9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,16 @@
 language: node_js
 node_js:
-  - '0.10'
+  - 'node'
+os:
+  - linux
+  - osx
+dist: trusty
 install:
-  - npm install
+  - gem install sass
+  - yarn install
 script:
-  - npm test
+  - yarn test
+  - yarn travis-build
 env:
   global:
     - secure: LeXDynRSyeHXR9KdmhYuP/zsc8uFsnYoOWI3fqg8x5SLOilfDyQ766idkT9NTRrdSR8WY7wP4DPs3hrBWGmcVq7BhytI9Q34YSgGS/Sds0jlm5AzSpYfAHpSQ+9ufQXNKN6lgxTkupdsWlc2Em20wUd5EfluDSOoeWVMlqHmKrw=
@@ -12,3 +18,10 @@ env:
 sudo: false
 notifications:
   email: false
+addons:
+  artifacts:
+    paths:
+      - $(ls ./dist/*.dmg | tr "\n" ":")
+      - $(ls ./dist/*.zip | tr "\n" ":")
+      - $(ls ./dist/*.deb | tr "\n" ":")
+      - $(ls ./dist/*.rpm | tr "\n" ":")
diff --git a/package.json b/package.json
index 9def832b9..d87827dd0 100644
--- a/package.json
+++ b/package.json
@@ -34,6 +34,7 @@
     "test": "grunt test",
     "lint": "grunt jshint",
     "start": "electron .",
+    "travis-build": "npm run icon-gen && grunt && NODE_ENV=production build --em.environment=$NODE_ENV --config.mac.bundleVersion='$TRAVIS_BUILD_NUMBER'",
     "dist": "npm run icon-gen && grunt && build --em.environment=$NODE_ENV",
     "pack": "npm run dist -- --dir",
     "pack-staging": "NODE_ENV=staging npm run pack",
@@ -57,7 +58,12 @@
         "path": "desktop",
         "acl": "public-read"
       },
-      "target": "mas",
+      "target": [
+        "mas",
+        "dmg",
+        "zip"
+      ],
+      "artifactName": "${productName}-${version}.${ext}",
       "bundleVersion": "4"
     },
     "win": {