diff --git a/build.sh b/build.sh
index 4532ac21b4..e6f3f9de4c 100755
--- a/build.sh
+++ b/build.sh
@@ -5,6 +5,6 @@ TARGETS=${1:-windows/386,windows/amd64,darwin/amd64,linux/386,linux/amd64,linux/
 export CGO_ENABLED=1
 docker pull karalabe/xgo-latest
 go get github.com/karalabe/xgo
-mkdir dist
-(cd dist/ && xgo --targets=$TARGETS ../)
-(chmod +x ./dist/*)
\ No newline at end of file
+mkdir dist && cd dist/
+xgo --targets=$TARGETS ../
+chmod +x *
diff --git a/deploy.sh b/deploy.sh
index ed1ea240d2..74e29bfa1a 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -5,11 +5,16 @@ if [ ! -z "$TRAVIS_TAG" ] &&
   echo "This will deploy!"
 
   # Cross-compile for all platforms
-  ./build.sh
+  export CGO_ENABLED=1
+  docker pull karalabe/xgo-latest
+  go get github.com/karalabe/xgo
+  mkdir dist/ && cd dist/
+  xgo --targets=windows/386,windows/amd64,darwin/amd64,linux/386,linux/amd64,linux/arm ../
+  chmod +x *
 
   # Copy libwinpthread-1.dll (user must rename the dll for their system to libwinpthread-1.dll)
-  cp ../.travis/win32/libwinpthread-1.dll dist/libwinpthread-1.win32.dll
-  cp ../.travis/win64/libwinpthread-1.dll dist/libwinpthread-1.win64.dll
+  cp ../.travis/win32/libwinpthread-1.dll libwinpthread-1.win32.dll
+  cp ../.travis/win64/libwinpthread-1.dll libwinpthread-1.win64.dll
 
   # Calculate SHA512 hashes
   sha512sum * > sha512_checksums.txt