diff --git a/.travis.yml b/.travis.yml
index 7685c31c..cbeaa4d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -149,13 +149,16 @@ notifications:
       - "[ %{repository_slug}#%{commit}] %{result} on %{branch} by %{author} (%{build_url} )"
 
 before_deploy:
-- zip -r build/cquery-$TRAVIS_TAG-$TRAVIS_OS_NAME.zip build/release/bin/ build/release/lib/clang+llvm-*/lib/libclang.* build/release/lib/clang+llvm-*/lib/clang/5.0.1/include/
+  #- zip -r build/cquery-$TRAVIS_TAG-$TRAVIS_OS_NAME.zip build/release/bin/ build/release/lib/clang+llvm-*/lib/libclang.* build/release/lib/clang+llvm-*/lib/clang/5.0.1/include/
+  - ci/before_deploy.sh
 
 deploy:
   provider: releases
   api_key:
     secure: Ahv4Wp1wveWILqp6HB8UmsXwwfZ103fuJV/u6W4oJFRpnbIXRCGFKaDR1Ql0hsHduKFd/76nNQGSVvNNuTXlWaK2n0bTu1EZ4VYmXk7Q7gn4ROP9XFrIZu0c9XKJ/bzehCLj3t6KT0R5MK5gQe+cBmx4S5uGsGG5/nM+GZpE1N4craRCh64UNXMvIx20sW4VQcgj1Ccrc/6Skb3HET7PKbY+IB/LXnaF3nM6V71LxKW2wlakBmzzaNatQ46QOcOCduY4edE8FqBs7yZ0eFktNZusmjiaZT12t0r1hVe0O8e0ER3u9/c3t+hbPUplMR2FAPBZXojgLVhSfFtBaj45T74oCIi0eUaDeS+Oxl6IzgyVho9RurOtaru3hLOVoaD9wR6lGhj6Nz/2Na3lOIorxHfAZ4OgUmluoFLCynO4ylMD03fMBGBshChnmYbrxLw0xLZP2005WUAj8JN64QOmFmLt3gV7TfVldSFHuwoZyESfkXPRM1Xn8RtgFi/89p4jtPtyBFLSaeDggCwfWEMfADCfJ/j8lXtAPdyEINoaKrxkH8qCPoMLNPXE7JhkP8L0Smdq4cFUEXg3wKWM2hXmWmh2Y25BAyh4qu9CrDPd5qqFcXMtyix4ZjmThLFs/oKYbbMUo4FQ5xT5dpt/VZOi4NpcAj0G/M3jWhu85tMdtTc=
-  file: build/cquery-$TRAVIS_TAG-$TRAVIS_OS_NAME.zip
+  #file: build/cquery-$TRAVIS_TAG-$TRAVIS_OS_NAME.zip
+  file: build/cquery-$TRAVIS_TAG-x86_64-apple-darwin.tar.xz
+  file: build/cquery-$TRAVIS_TAG-x86_64-unknown-linux-gnu.tar.xz
   skip_cleanup: true
   on:
     repo: cquery-project/cquery
diff --git a/ci/before_deploy.sh b/ci/before_deploy.sh
new file mode 100755
index 00000000..2f239d88
--- /dev/null
+++ b/ci/before_deploy.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+root=$(realpath "$(dirname "$0")/..")
+version=$(TZ=UTC date +v%Y%m%d)
+
+case "$TRAVIS_OS_NAME" in
+  osx)
+    SO=dylib
+    name=cquery-$version-x86_64-apple-darwin ;;
+  *)
+    SO=so
+    name=cquery-$version-x86_64-unknown-linux-gnu ;;
+esac
+
+pkg=$(mktemp -d)
+
+cd "$root/build/release"
+rsync -rtLR bin ./lib/clang+llvm-*/lib/libclang.$SO.? ./lib/clang+llvm-*/lib/clang/*/include "$pkg/"
+
+cd "$pkg"
+strip -s bin/cquery lib/clang+llvm*/lib/libclang.$SO.?
+if [[ $(uname) == Linux ]]; then
+  # ./bin/cquery -> $name/bin/cquery
+  tar -Jcf "$root/build/$name.tar.xz" --owner 0 --group 0 --xform "s,^\./,$name/," .
+else
+  tar -zcf "$root/build/$name.tar.gz" --uid 0 --gid 0 -s ",^\./,$name/," .
+fi
+rm -r "$pkg"