diff --git a/src/doc/trpl/SUMMARY.md b/src/doc/trpl/SUMMARY.md
index a179f8fa55e5e..81a550b0f9a3d 100644
--- a/src/doc/trpl/SUMMARY.md
+++ b/src/doc/trpl/SUMMARY.md
@@ -55,6 +55,7 @@
     * [Deref coercions](deref-coercions.md)
     * [Macros](macros.md)
     * [Raw Pointers](raw-pointers.md)
+    * [`unsafe`](unsafe.md)
 * [Nightly Rust](nightly-rust.md)
     * [Compiler Plugins](compiler-plugins.md)
     * [Inline Assembly](inline-assembly.md)
diff --git a/src/doc/trpl/unsafe-code.md b/src/doc/trpl/unsafe.md
similarity index 98%
rename from src/doc/trpl/unsafe-code.md
rename to src/doc/trpl/unsafe.md
index ab5e8ed16ad23..7fe9a1fd27e8e 100644
--- a/src/doc/trpl/unsafe-code.md
+++ b/src/doc/trpl/unsafe.md
@@ -1,4 +1,4 @@
-% Unsafe Code
+% Unsafe
 
 Rust’s main draw is its powerful static guarantees about behavior. But safety
 checks are conservative by nature: there are some programs that are actually
@@ -76,7 +76,7 @@ behaviors that are certainly bad, but are expressly _not_ unsafe:
 * Integer overflow
 
 Rust cannot prevent all kinds of software problems. Buggy code can and will be
-written in Rust. These things arne’t great, but they don’t qualify as `unsafe`
+written in Rust. These things aren’t great, but they don’t qualify as `unsafe`
 specifically.
 
 # Unsafe Superpowers
diff --git a/src/librustc/diagnostics.rs b/src/librustc/diagnostics.rs
index ba226c88e5623..33ecc0ce20507 100644
--- a/src/librustc/diagnostics.rs
+++ b/src/librustc/diagnostics.rs
@@ -208,7 +208,7 @@ fn main() {
     unsafe { f(); }
 }
 
-See also http://doc.rust-lang.org/book/unsafe-code.html
+See also http://doc.rust-lang.org/book/unsafe.html
 "##,
 
 E0152: r##"