diff --git a/.travis.yml b/.travis.yml
index f26d7d61..f4428ed9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,11 @@ matrix:
   # tests pass on the stable versions of Go.
   fast_finish: true
 
+jobs:
+  include:
+      - go: 1.8.x
+      - env: MYDEPLOY=mydeploy
+
 notifications:
       email: false
 
@@ -43,7 +48,9 @@ script:
 
 deploy:
     provider: bintray
-    file: binaries/deploy.json
+    file: ci/deploy.json
     user: 42wim
+    on: 
+        condition: "$MYDEPLOY = mydeploy"
     key:
         secure: "CeXXe6JOmt7HYR81MdWLua0ltQHhDdkIeRGBFbgd7hkb1wi8eF9DgpAcQrTso8NIlHNZmSAP46uhFgsRvkuezzX0ygalZ7DCJyAyn3sAMEh+UQSHV1WGThRehTtidqRGjetzsIGSwdrJOWil+XTfbO1Z8DGzfakhSuAZka8CM4BAoe3YeP9rYK8h+84x0GHfczvsLtXZ3mWLvQuwe4pK6+ItBCUg0ae7O7ZUpWHy0xQQkkWztY/6RAzXfaG7DuGjIw+20fhx3WOXRNpHCtZ6Bc3qERCpk0s1HhlQWlrN9wDaFTBWYwlvSnNgvxxMbNXJ6RrRJ0l0bA7FUswYwyroxhzrGLdzWDg8dHaQkypocngdalfhpsnoO9j3ApJhomUFJ3UoEq5nOGRUrKn8MPi+dP0zE4kNQ3e4VNa1ufNrvfpWolMg3xh8OXuhQdD5wIM5zFAbRJLqWSCVAjPq4DDPecmvXBOlIial7oa312lN5qnBnUjvAcxszZ+FUyDHT1Grxzna4tMwxY9obPzZUzm7359AOCCwIQFVB8GLqD2nwIstcXS0zGRz+fhviPipHuBa02q5bGUZwmkvrSNab0s8Jo7pCrel2Rz3nWPKaiCfq2WjbW1CLheSMkOQrjsdUd1hhbqNWFPUjJPInTc77NAKCfm5runv5uyowRLh4NNd0sI="
diff --git a/ci/bintray.sh b/ci/bintray.sh
index 0d3efa6e..4e43ef3d 100755
--- a/ci/bintray.sh
+++ b/ci/bintray.sh
@@ -1,7 +1,10 @@
 #!/bin/bash
+go version |grep go1.8 || exit
 VERSION=$(git describe --tags)
 mkdir ci/binaries
-go build -x -ldflags "-s -w -X main.githash=$(git log --pretty=format:'%h' -n 1)" -o ci/binaries/matterbridge-$VERSION-$GOOS-$GOARCH
+GOOS=windows GOARCH=amd64 go build -x -ldflags "-s -w -X main.githash=$(git log --pretty=format:'%h' -n 1)" -o ci/binaries/matterbridge-$VERSION-win64.exe
+GOOS=linux GOARCH=amd64 go build -x -ldflags "-s -w -X main.githash=$(git log --pretty=format:'%h' -n 1)" -o ci/binaries/matterbridge-$VERSION-linux64
+GOOS=linux GOARCH=arm go build -x -ldflags "-s -w -X main.githash=$(git log --pretty=format:'%h' -n 1)" -o ci/binaries/matterbridge-$VERSION-linux-arm
 cd ci
 cat > deploy.json <<EOF
 {
@@ -11,7 +14,7 @@ cat > deploy.json <<EOF
         "subject": "42wim"
     },
     "version": {
-        "name": "$VERSION-$GOOS-$GOARCH"
+        "name": "$VERSION"
     },
     "files":
         [