diff --git a/CHANGELOG.md b/CHANGELOG.md
index aebf6449..f0c42dfb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -221,7 +221,7 @@ This release includes the following new features:
   * [`Response::content_type()`] was added to easily retrieve the Content-Type
     header of a response.
   * Size limits on incoming data are [now
-    configurable](https://rocket.rs/guide/overview/#configuration).
+    configurable](https://rocket.rs/guide/configuration/#data-limits).
   * [`Request::limits()`] was added to retrieve incoming data limits.
   * Responders may dynamically adjust their response based on the incoming
     request.
diff --git a/contrib/src/templates/mod.rs b/contrib/src/templates/mod.rs
index 1c3882e9..a497b32c 100644
--- a/contrib/src/templates/mod.rs
+++ b/contrib/src/templates/mod.rs
@@ -35,7 +35,7 @@ const DEFAULT_TEMPLATE_DIR: &'static str = "templates";
 /// `template_dir` configuration parameter and defaults to `templates/`. The
 /// path set in `template_dir` should be relative to the Rocket configuration
 /// file. See the [configuration
-/// chapter](https://rocket.rs/guide/overview/#configuration) of the guide for
+/// chapter](https://rocket.rs/guide/configuration/#extras) of the guide for
 /// more information on configuration.
 ///
 /// Templates are discovered according to their extension. At present, this
diff --git a/lib/src/lib.rs b/lib/src/lib.rs
index b8d19c99..355d3d47 100644
--- a/lib/src/lib.rs
+++ b/lib/src/lib.rs
@@ -88,8 +88,8 @@
 //! Rocket and Rocket libraries are configured via the `Rocket.toml` file and/or
 //! `ROCKET_{PARAM}` environment variables. For more information on how to
 //! configure Rocket, see the [configuration
-//! section](https://rocket.rs/guide/overview/#configuration) of the guide as
-//! well as the [config](/rocket/config) module documentation.
+//! section](https://rocket.rs/guide/configuration/) of the guide as well as the
+//! [config](/rocket/config) module documentation.
 //!
 //! ## Testing
 //!