diff --git a/Cargo.toml b/Cargo.toml
index d1ca31661d..70606c881f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,7 +5,7 @@ authors = [
 ]
 categories = ["concurrency", "embedded", "no-std"]
 description = "Real Time For the Masses (RTFM): a concurrency framework for building real time systems"
-documentation = "https://rtfm-rs.github.io/cortex-m-rtfm/book/en"
+documentation = "https://rtfm.rs/"
 edition = "2018"
 keywords = ["arm", "cortex-m"]
 license = "MIT OR Apache-2.0"
diff --git a/README.md b/README.md
index ff33da9859..68f3fbb7d3 100644
--- a/README.md
+++ b/README.md
@@ -43,9 +43,9 @@ A concurrency framework for building real time systems.
 
 - Applications must be written using the 2018 edition.
 
-## [User documentation](https://japaric.github.io/rtfm5/book/en)
+## [User documentation](https://rtfm.rs)
 
-## [API reference](https://japaric.github.io/rtfm5/api/rtfm/index.html)
+## [API reference](https://rtfm.rs/api/rtfm/index.html)
 
 ## Acknowledgments