diff --git a/.travis.yml b/.travis.yml
index 0f4c51f4..0fc04637 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,39 +1,42 @@
-sudo: required
+osx_image: xcode7.3
 
+sudo: required
 dist: trusty
 
-language: node_js
+language: c
 
-node_js:
-  - 6
-  - 5
-  - 4
+matrix:
+  include:
+    - os: osx
+    - os: linux
+      env: CC=clang CXX=clang++ npm_config_clang=1
+      compiler: clang
 
 cache:
   directories:
-    - node_modules
+  - node_modules
+  - app/node_modules
+  - $HOME/.electron
+  - $HOME/.cache
 
 addons:
   apt:
-    sources:
-      - ubuntu-toolchain-r-test
     packages:
-      - g++-4.8
-    packages:
-      - xvfb
+      - libgnome-keyring-dev
+      - icnsutils
+
+before_install:
+  - mkdir -p /tmp/git-lfs && curl -L https://github.com/github/git-lfs/releases/download/v1.2.1/git-lfs-$([ "$TRAVIS_OS_NAME" == "linux" ] && echo "linux" || echo "darwin")-amd64-1.2.1.tar.gz | tar -xz -C /tmp/git-lfs --strip-components 1 && /tmp/git-lfs/git-lfs pull
 
 install:
-  - export CXX="g++-4.8"
-  - npm install
-  - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16"
-  - export DISPLAY=':99.0'
-  - Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
-  - sudo apt-get install --no-install-recommends -y icnsutils graphicsmagick xz-utils xorriso
-
-before_script:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start &
-  - sleep 3
+- nvm install 6
+- npm install electron-builder@next # force install next version to test electron-builder
+- npm install
+- npm prune
 
 script:
-  - npm run lint
+- npm run release
+
+branches:
+  except:
+    - "/^v\\d+\\.\\d+\\.\\d+$/"
diff --git a/package.json b/package.json
index 97836fdc..551c0050 100644
--- a/package.json
+++ b/package.json
@@ -89,6 +89,7 @@
     "prepush": "npm test",
     "postinstall": "install-app-deps",
     "pack": "npm run build && build --dir",
-    "dist": "npm run build && build"
+    "dist": "npm run build && build",
+    "release": "npm run build && build --publish=onTagOrDraft"
   }
 }