diff --git a/Cargo.toml b/Cargo.toml
index 4bfd47d..3cff96d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,14 +1,17 @@
 [package]
 
 name = "bitflags"
-version = "0.8.0" # also update number in readme for breaking changes
+# NB: When modifying, also modify:
+#   1. html_root_url in lib.rs
+#   2. number in readme (for breaking changes)
+version = "0.8.0"
 authors = ["The Rust Project Developers"]
 license = "MIT/Apache-2.0"
 keywords = ["bit", "bitmask", "bitflags"]
 readme = "README.md"
 repository = "https://github.com/rust-lang/bitflags"
 homepage = "https://github.com/rust-lang/bitflags"
-documentation = "https://doc.rust-lang.org/bitflags"
+documentation = "https://docs.rs/bitflags"
 categories = ["no-std"]
 description = """
 A macro to generate structures which behave like bitflags.
diff --git a/README.md b/README.md
index 847f982..1a140f2 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ A Rust macro to generate structures which behave like a set of bitflags
 
 [![Build Status](https://travis-ci.org/rust-lang-nursery/bitflags.svg?branch=master)](https://travis-ci.org/rust-lang-nursery/bitflags)
 
-[Documentation](https://doc.rust-lang.org/bitflags)
+[Documentation](https://docs.rs/bitflags)
 
 ## Usage
 
diff --git a/src/lib.rs b/src/lib.rs
index 899b018..1a6d67f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -12,6 +12,7 @@
 
 #![no_std]
 
+#![doc(html_root_url = "https://docs.rs/bitflags/0.8.2")]
 // When compiled for the rustc compiler itself we want to make sure that this is
 // an unstable crate.
 #![cfg_attr(rustbuild, feature(staged_api))]