diff --git a/Cargo.toml b/Cargo.toml
index 552e069..dfea729 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,10 +2,10 @@
 name = "rustc-demangle"
 version = "0.1.21"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 readme = "README.md"
-repository = "https://github.com/alexcrichton/rustc-demangle"
-homepage = "https://github.com/alexcrichton/rustc-demangle"
+repository = "https://github.com/rust-lang/rustc-demangle"
+homepage = "https://github.com/rust-lang/rustc-demangle"
 documentation = "https://docs.rs/rustc-demangle"
 description = """
 Rust compiler symbol demangling.
diff --git a/README.md b/README.md
index 0833e1e..ba7312c 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Demangling for Rust symbols, written in Rust.
 
 ## Usage
 
-You can add this as a dependency via your `Cargo.toml`
+You can add this as a dependency via your `Cargo.toml`:
 
 ```toml
 [dependencies]
@@ -19,7 +19,7 @@ documentation](https://docs.rs/rustc-demangle) for usage.
 ## Usage from non-Rust languages
 
 You can also use this crate from other languages via the C API wrapper in the
-`crates/capi` directory. This can be build with:
+`crates/capi` directory. This can be built with:
 
 ```sh
 $ cargo build -p rustc-demangle-capi --release
@@ -35,9 +35,9 @@ platform). These objects implement the interface specified in
 This project is licensed under either of
 
  * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
-   http://www.apache.org/licenses/LICENSE-2.0)
+   https://www.apache.org/licenses/LICENSE-2.0)
  * MIT license ([LICENSE-MIT](LICENSE-MIT) or
-   http://opensource.org/licenses/MIT)
+   https://opensource.org/licenses/MIT)
 
 at your option.
 
diff --git a/crates/capi/Cargo.toml b/crates/capi/Cargo.toml
index a59a768..0e910bf 100644
--- a/crates/capi/Cargo.toml
+++ b/crates/capi/Cargo.toml
@@ -5,8 +5,8 @@ authors = ["Torste Aikio <zokier@gmail.com>"]
 description = """
 C API for the `rustc-demangle` crate
 """
-license = "MIT/Apache-2.0"
-repository = "https://github.com/alexcrichton/rustc-demangle"
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/rust-lang/rustc-demangle"
 
 [lib]
 name = "rustc_demangle"
diff --git a/src/v0.rs b/src/v0.rs
index 3e88fa6..913f49f 100644
--- a/src/v0.rs
+++ b/src/v0.rs
@@ -1446,7 +1446,7 @@ mod tests {
 
     #[test]
     fn demangle_extra_suffix() {
-        // From alexcrichton/rustc-demangle#27:
+        // From rust-lang/rustc-demangle#27:
         t_nohash!(
             "_RNvNtNtNtNtCs92dm3009vxr_4rand4rngs7adapter9reseeding4fork23FORK_HANDLER_REGISTERED.0.0",
             "rand::rngs::adapter::reseeding::fork::FORK_HANDLER_REGISTERED.0.0"