diff --git a/.travis.yml b/.travis.yml
index 8025d275cc94..6b8dc0fd7c89 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,30 @@
+sudo: false
 language: rust
 rust:
  - stable
  - beta
  - nightly
-
-sudo: false
+os:
+ - linux
+ - osx
 
 script:
  - cargo build
  - cargo test
+
+before_deploy:
+  # TODO: cross build
+ - cargo build --release --target=x86_64-unknown-linux-gnu
+ - tar czf rustfmt-x86_64-unknown-linux-gnu.tar.gz Contributing.md Design.md README.md -C target/x86_64-unknown-linux-gnu/release/rustfmt rustfmt
+
+deploy:
+  provider: releases
+  api_key:
+    secure: "your own encrypted key"
+  file:
+  - rustfmt-x86_64-unknown-linux-gnu.tar.gz
+  on:
+    repo: nrc/rustfmt
+    tags: true
+    condition: "$TRAVIS_OS_NAME = linux"
+  skip_cleanup: true
diff --git a/README.md b/README.md
index 4951ce5d5826..d7566d847658 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# rustfmt
+# rustfmt [![Build Status](https://travis-ci.org/nrc/rustfmt.svg)](https://travis-ci.org/nrc/rustfmt)
 
 A tool for formatting Rust code according to style guidelines.