diff --git a/.travis.yml b/.travis.yml
index df6f60a48e..c5299e914e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,11 @@
 sudo: required
 services:
   - docker
-addons:
-  artifacts:
-    working_dir: artifacts
-    target_paths:
-    - /builds
 os:
   - linux
   - osx
 dist: trusty
 osx_image: xcode8.3
-sudo: required
 language: cpp
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ci/travis_linux_before_install; fi
diff --git a/ci/travis_linux_install b/ci/travis_linux_install
index 02d0d6d2e8..40322c58cb 100755
--- a/ci/travis_linux_install
+++ b/ci/travis_linux_install
@@ -4,4 +4,4 @@ set -x
 
 sudo apt-get remove -y llvm-*
 sudo rm -rf /usr/local/*
-sudo apt-get install -y clang-6.0 libclang-6.0 libclang-6.0-dev llvm-6.0 llvm-6.0-dev liblld-6.0 liblld-6.0-dev cmake wine1.6-amd64
+sudo apt-get install -y clang-6.0 libclang-6.0 libclang-6.0-dev llvm-6.0 llvm-6.0-dev liblld-6.0 liblld-6.0-dev cmake wine1.6-amd64 s3cmd
diff --git a/ci/travis_linux_script b/ci/travis_linux_script
index f80ac33c24..2bb4323066 100755
--- a/ci/travis_linux_script
+++ b/ci/travis_linux_script
@@ -8,11 +8,16 @@ export CXX=clang++-6.0
 echo $PATH
 mkdir build
 cd build
-cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd)
-make -j2 install
-./zig build --build-file ../build.zig test
+# cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd)
+# make -j2 install
+# ./zig build --build-file ../build.zig test
 
-cd $TRAVIS_BUILD_DIR
-rm .gitignore
-git clean -fd
-docker run -it --mount type=bind,source="$TRAVIS_BUILD_DIR",target=/z ziglang/static-base:llvm6-1 -j2 $TRAVIS_COMMIT
+if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then
+  mkdir $TRAVIS_BUILD_DIR/artifacts
+  docker run -it --mount type=bind,source="$TRAVIS_BUILD_DIR/artifacts",target=/z ziglang/static-base:llvm6-1 -j2 $TRAVIS_COMMIT
+  echo "access_key = $AWS_ACCESS_KEY_ID" >> ~/.s3cfg
+  echo "secret_key = $AWS_SECRET_ACCESS_KEY" >> ~/.s3cfg
+  s3cmd put -P $TRAVIS_BUILD_DIR/artifacts/* s3://ziglang.org/builds/
+  touch empty
+  s3cmd put -P empty s3://ziglang.org/builds/zig-linux-x86_64-$TRAVIS_BRANCH.tar.xz --add-header=x-amz-website-redirect-location:/builds/$(ls $TRAVIS_BUILD_DIR/artifacts)
+fi