diff --git a/README.md b/README.md
index a380ea39c..f4eba03b4 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ the Rust programming language. It is:
 
 The API docs for the master branch are published [here][master-dox].
 
-[master-dox]: https://tokio-rs.github.io/tokio/tokio/
+[master-dox]: https://tokio-rs.github.io/tokio/doc/tokio/
 
 ## Overview
 
diff --git a/tokio-current-thread/README.md b/tokio-current-thread/README.md
index eb60e7d82..341c8c336 100644
--- a/tokio-current-thread/README.md
+++ b/tokio-current-thread/README.md
@@ -2,7 +2,7 @@
 
 Single threaded executor for Tokio.
 
-[Documentation](https://tokio-rs.github.io/tokio/tokio_current_thread/)
+[Documentation](https://docs.rs/tokio-current-thread/0.1.4/tokio_current_thread/)
 
 ## Overview
 
diff --git a/tokio-executor/README.md b/tokio-executor/README.md
index 87c382b4e..67215fccd 100644
--- a/tokio-executor/README.md
+++ b/tokio-executor/README.md
@@ -31,10 +31,10 @@ executor, including:
 
 * [`Park`] abstracts over blocking and unblocking the current thread.
 
-[`Executor`]: https://tokio-rs.github.io/tokio/tokio_executor/trait.Executor.html
-[`enter`]: https://tokio-rs.github.io/tokio/tokio_executor/fn.enter.html
-[`DefaultExecutor`]: https://tokio-rs.github.io/tokio/tokio_executor/struct.DefaultExecutor.html
-[`Park`]: https://tokio-rs.github.io/tokio/tokio_executor/park/index.html
+[`Executor`]: https://docs.rs/tokio-executor/0.1.6/tokio_executor/trait.Executor.html
+[`enter`]: https://docs.rs/tokio-executor/0.1.6/tokio_executor/fn.enter.html
+[`DefaultExecutor`]: https://docs.rs/tokio-executor/0.1.6/tokio_executor/struct.DefaultExecutor.html
+[`Park`]: https://docs.rs/tokio-executor/0.1.6/tokio_executor/park/trait.Park.html
 
 ## License
 
diff --git a/tokio-reactor/README.md b/tokio-reactor/README.md
index dc48026ce..d272aec36 100644
--- a/tokio-reactor/README.md
+++ b/tokio-reactor/README.md
@@ -25,10 +25,10 @@ are building a custom I/O resource.
 
 [`mio`]: http://github.com/carllerche/mio
 [`futures`]: http://github.com/rust-lang-nursery/futures-rs
-[`Reactor`]: https://tokio-rs.github.io/tokio/tokio_reactor/struct.Reactor.html
-[`Handle`]: https://tokio-rs.github.io/tokio/tokio_reactor/struct.Handle.html
-[`Registration`]: https://tokio-rs.github.io/tokio/tokio_reactor/struct.Registration.html
-[`PollEvented`]: https://tokio-rs.github.io/tokio/tokio_reactor/struct.PollEvented.html
+[`Reactor`]: https://docs.rs/tokio-reactor/0.1.8/tokio_reactor/struct.Reactor.html
+[`Handle`]: https://docs.rs/tokio-reactor/0.1.8/tokio_reactor/struct.Handle.html
+[`Registration`]: https://docs.rs/tokio-reactor/0.1.8/tokio_reactor/struct.Registration.html
+[`PollEvented`]: https://docs.rs/tokio-reactor/0.1.8/tokio_reactor/struct.PollEvented.html
 [`tokio`]: ../
 
 ## License
diff --git a/tokio-trace/README.md b/tokio-trace/README.md
index ca553ca66..7f1adc0d7 100644
--- a/tokio-trace/README.md
+++ b/tokio-trace/README.md
@@ -2,7 +2,7 @@
 
 A scoped, structured logging and diagnostics system.
 
-[Documentation](https://tokio-rs.github.io/tokio/tokio_trace/index.html)
+[Documentation](https://tokio-rs.github.io/tokio/doc/tokio_trace/)
 
 ## Overview
 
diff --git a/tokio-trace/tokio-trace-core/README.md b/tokio-trace/tokio-trace-core/README.md
index 3bc117b17..6b49b372c 100644
--- a/tokio-trace/tokio-trace-core/README.md
+++ b/tokio-trace/tokio-trace-core/README.md
@@ -2,7 +2,7 @@
 
 Core primitives for `tokio-trace`.
 
-[Documentation](https://tokio-rs.github.io/tokio/tokio_trace_core/index.html)
+[Documentation](https://tokio-rs.github.io/tokio/doc/tokio_trace_core/index.html)
 
 ## Overview
 
@@ -34,16 +34,16 @@ API. However, this crate's API will change very infrequently, so it may be used
 when dependencies must be very stable.
 
 [`tokio-trace`]: ../
-[`Span`]: https://tokio-rs.github.io/tokio/tokio_trace_core/span/struct.Span.html
-[`Event`]: https://tokio-rs.github.io/tokio/tokio_trace_core/event/struct.Event.html
-[`Subscriber`]: https://tokio-rs.github.io/tokio/tokio_trace_core/subscriber/trait.Subscriber.html
-[`Metadata`]: https://tokio-rs.github.io/tokio/tokio_trace_core/metadata/struct.Metadata.html
-[`Callsite`]: https://tokio-rs.github.io/tokio/tokio_trace_core/callsite/trait.Callsite.html
-[`Field`]: https://tokio-rs.github.io/tokio/tokio_trace_core/field/struct.Field.html
-[`FieldSet`]: https://tokio-rs.github.io/tokio/tokio_trace_core/field/struct.FieldSet.html
-[`Value`]: https://tokio-rs.github.io/tokio/tokio_trace_core/field/trait.Value.html
-[`ValueSet`]: https://tokio-rs.github.io/tokio/tokio_trace_core/field/struct.ValueSet.html
-[`Dispatch`]: https://tokio-rs.github.io/tokio/tokio_trace_core/dispatcher/struct.Dispatch.html
+[`Span`]: https://tokio-rs.github.io/tokio/doc/tokio_trace_core/span/struct.Span.html
+[`Event`]: https://tokio-rs.github.io/tokio/doc/tokio_trace_core/event/struct.Event.html
+[`Subscriber`]: https://tokio-rs.github.io/tokio/doc/tokio_trace_core/subscriber/trait.Subscriber.html
+[`Metadata`]: https://tokio-rs.github.io/tokio/doc/tokio_trace_core/metadata/struct.Metadata.html
+[`Callsite`]: https://tokio-rs.github.io/tokio/doc/tokio_trace_core/callsite/trait.Callsite.html
+[`Field`]: https://tokio-rs.github.io/tokio/doc/tokio_trace_core/field/struct.Field.html
+[`FieldSet`]: https://tokio-rs.github.io/tokio/doc/tokio_trace_core/field/struct.FieldSet.html
+[`Value`]: https://tokio-rs.github.io/tokio/doc/tokio_trace_core/field/trait.Value.html
+[`ValueSet`]: https://tokio-rs.github.io/tokio/doc/tokio_trace_core/field/struct.ValueSet.html
+[`Dispatch`]: https://tokio-rs.github.io/tokio/doc/tokio_trace_core/dispatcher/struct.Dispatch.html
 
 ## License
 
diff --git a/tokio-udp/README.md b/tokio-udp/README.md
index e677c0749..02ea251f7 100644
--- a/tokio-udp/README.md
+++ b/tokio-udp/README.md
@@ -2,7 +2,7 @@
 
 UDP bindings for `tokio`.
 
-[Documentation](https://tokio-rs.github.io/tokio/tokio_udp/)
+[Documentation](https://docs.rs/tokio-udp/0.1.3/tokio_udp/)
 
 ## License