diff --git a/.travis.yml b/.travis.yml
index c8b2c19..4ef1ed1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,16 @@
 language: rust
 sudo: false
 
+cache: cargo
+
 matrix:
   include:
     - rust: stable
-    - os: osx
-    - rust: 1.20.0
-      script: cargo build
-
     - rust: beta
     - rust: nightly
-      before_script:
-        - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
-      after_success:
-        - travis-cargo doc-upload
+    # minimum rustc version
+    - rust: 1.20.0
+      script: cargo build
 
 script:
   - cargo test
@@ -21,10 +18,6 @@ script:
   - rustdoc --test README.md -L target/debug/deps
   - cargo doc --no-deps
 
-env:
-  global:
-    secure: "OOUspihcokV8i5XM5Db54DSkaCcQqyXBdpsL7IVhXSgFsa/zyhEBR4Fzss9nUmBIlob5h5ZCnZach6Ut8Rae4DDnGYOeVHOmzqUcRY6QQQZybTdOEJi2f7byMxGd4PRku6feChLKk9euM128uvTtCi22EGSYBo5KBxqR6Xizoyr8MnxuicApm8MhLY28ikF5sKHZ4D7hC5+Nv16oIfrtwROeK5mj32uiTPDK3NBEQM/rH4/jvQAnL5uLgW6lXVlENQ0QhEroXeSEaX5PWvuZ5NXNKw7ro4vxGQxZfB4kbCP63BEoSfuEY41qMnjVFr/9zcNU9ZUxLIG0pimjWR5qKou+bVzAAQEdTCdXM1O40rN9uLc304EB6FX7P1H/tAfVdPmaux+DzyPXGid+QNi6CMubWNOYRWYlZ3WJ2rMExB3f2asSO8/JlF7c97cr18YVIRzmAempD7mwvJ8+gVUTpP5uq4jdavC2WcUFAivqtu+VNIxNvOpuZABh0cEiM7PVgfZHhLBpxat8vpCp1YusDvKzup+P7he/bP+TbLOnuNys6gQMZBoh7Fobco2KxOrd55PAs4AoUd8GITufjujzkC637eZuVNw8x1C83VqFO2yhXgl100VIocwWIdUp4oOGW139K2CW247qdo99fsyVm2jspfyXAuFeZ6HFR7o9GjU="
-
 notifications:
   email:
     on_success: never
diff --git a/Cargo.toml b/Cargo.toml
index 8c4b371..0b16291 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "http"
-version = "0.1.0"
+version = "0.1.0" # remember to update html_root_url
 readme = "README.md"
 documentation = "https://docs.rs/http"
 repository = "https://github.com/hyperium/http"
@@ -9,11 +9,13 @@ license = "MIT/Apache-2.0"
 authors = [
   "Alex Crichton <alex@alexcrichton.com>",
   "Carl Lerche <me@carllerche.com>",
-  "Sean McArthur <sean.monstar@gmail.com>",
+  "Sean McArthur <sean@seanmonstar.com>",
 ]
 description = """
 A set of types for representing HTTP requests and responses.
 """
+keywords = ["http"]
+categories = ["web-programming"]
 
 [dependencies]
 bytes = "0.4"
diff --git a/README.md b/README.md
index 25ad628..15c9c54 100644
--- a/README.md
+++ b/README.md
@@ -2,14 +2,14 @@
 
 A general purpose library of common HTTP types
 
-[![Build Status](https://travis-ci.org/carllerche/http.svg?branch=master)](https://travis-ci.org/carllerche/http)
-<!-- [![Crates.io](https://img.shields.io/crates/v/http.svg?maxAge=2592000)](https://crates.io/crates/http) -->
-<!-- [![Documentation](https://docs.rs/http/badge.svg)][dox] -->
+[![Build Status](https://travis-ci.org/hyperium/http.svg?branch=master)](https://travis-ci.org/hyperium/http)
+[![Crates.io](https://img.shields.io/crates/v/http.svg?maxAge=2592000)](https://crates.io/crates/http)
+[![Documentation](https://docs.rs/http/badge.svg)][dox]
 
 More information about this crate can be found in the [crate
-documentation][dox]
+documentation][dox].
 
-[dox]: https://carllerche.github.io/http
+[dox]: https://docs.rs/http
 
 ## Usage
 
@@ -17,7 +17,7 @@ To use `http`, first add this to your `Cargo.toml`:
 
 ```toml
 [dependencies]
-http = { git = 'https://github.com/carllerche/http' } # soon to be on crates.io!
+http = "0.1"
 ```
 
 Next, add this to your crate:
diff --git a/src/lib.rs b/src/lib.rs
index 286de17..2dd5de6 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,3 +1,5 @@
+#![doc(html_root_url = "https://docs.rs/http/0.1.0")]
+
 //! A general purpose library of common HTTP types
 //!
 //! This crate is a general purpose library for common types found when working