diff --git a/.travis.yml b/.travis.yml
index dc4cb496..aedf86ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,40 +1,22 @@
 language: rust
-sudo: false
-
 matrix:
   include:
     - rust: stable
     - rust: beta
     - rust: nightly
-    - rust: 1.21.0
-
-    # Code coverage + documentation
-    - rust: nightly
-      before_script:
-        - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
+    - name: "master doc to gh-pages"
+      rust: nightly
       script:
-        - cargo build
-        - rustdoc --test README.md -L target/debug -L target/debug/deps
         - cargo doc --no-deps
-      after_success:
-        - travis-cargo --only nightly doc-upload
-        - travis-cargo coveralls --no-sudo
-      addons:
-        apt:
-          packages:
-            - libcurl4-openssl-dev
-            - libelf-dev
-            - libdw-dev
-      env:
-        global:
-          - secure: "BkV2h2/dkKFUBhdiN3CvUt/zVdIsLhqlVIpS5uV5mQNyiQyZQ+czCmxvAoBF0r6ER6gdbUwvtBVTZ9fT+JmdpxcRJB7/oJ535MYRVkng13GjmDjj3y4KbGZdKsXgNpWPk5EbpFYZ6VdJ6LnEOBEE2aWbAbHwXgWxDCQtlgTeoXQ="
-          - RUSTFLAGS='-C link-dead-code'
-
+      deploy:
+        provider: script
+        script: curl -LsSf https://git.io/fhJ8n | rustc - && (cd target/doc && ../../rust_out)
+        skip_cleanup: true
+        on:
+          branch: master
 script:
-  - cargo build --verbose
-  - cargo test --verbose
-  - cargo test --verbose --no-default-features
-
+  - cargo test
+  - cargo test --no-default-features
 notifications:
   email:
     on_success: never
diff --git a/README.md b/README.md
index 22e2b285..77963e28 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # tar-rs
 
-[![Build Status](https://travis-ci.org/alexcrichton/tar-rs.svg?branch=master)](https://travis-ci.org/alexcrichton/tar-rs)
+[![Build Status](https://travis-ci.com/alexcrichton/tar-rs.svg?branch=master)](https://travis-ci.com/alexcrichton/tar-rs)
 [![Build status](https://ci.appveyor.com/api/projects/status/0udgokm2fc6ljorj?svg=true)](https://ci.appveyor.com/project/alexcrichton/tar-rs)
 [![Coverage Status](https://coveralls.io/repos/alexcrichton/tar-rs/badge.svg?branch=master&service=github)](https://coveralls.io/github/alexcrichton/tar-rs?branch=master)