diff --git a/Cargo.toml b/Cargo.toml
index da876423ce9b..1a1a1fa2330a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Scott Olson <scott@solson.me>"]
 description = "An experimental interpreter for Rust MIR."
 license = "MIT/Apache-2.0"
 name = "miri"
-repository = "https://github.com/solson/miri"
+repository = "https://github.com/rust-lang/miri"
 version = "0.1.0"
 build = "build.rs"
 default-run = "miri"
diff --git a/README.md b/README.md
index 897bf0b66e7e..856e1273131a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Miri [![Build Status](https://travis-ci.org/solson/miri.svg?branch=master)](https://travis-ci.org/solson/miri) [![Windows build status](https://ci.appveyor.com/api/projects/status/github/solson/miri?svg=true)](https://ci.appveyor.com/project/solson63299/miri)
+# Miri [![Build Status](https://travis-ci.com/rust-lang/miri.svg?branch=master)](https://travis-ci.com/rust-lang/miri) [![Windows build status](https://ci.appveyor.com/api/projects/status/github/rust-lang/miri?svg=true)](https://ci.appveyor.com/project/rust-lang-libs/miri)
 
 
 An experimental interpreter for [Rust][rust]'s
@@ -28,11 +28,11 @@ Miri has already discovered some [real-world bugs](#bugs-found-by-miri).
 Install Miri as a cargo subcommand:
 
 ```sh
-cargo +nightly install --force --git https://github.com/solson/miri miri
+cargo +nightly install --force --git https://github.com/rust-lang/miri miri
 ```
 
 If this does not work, try using the nightly version given in
-[this file](https://raw.githubusercontent.com/solson/miri/master/rust-version). CI
+[this file](https://raw.githubusercontent.com/rust-lang/miri/master/rust-version). CI
 should ensure that this nightly always works.
 
 You have to use a consistent Rust version for building miri and your project, so
diff --git a/tests/run-pass/validation_lifetime_resolution.rs b/tests/run-pass/validation_lifetime_resolution.rs
index 4d919f735255..3375632c9d70 100644
--- a/tests/run-pass/validation_lifetime_resolution.rs
+++ b/tests/run-pass/validation_lifetime_resolution.rs
@@ -22,7 +22,7 @@ fn foo<T>(mut x: T) where for<'a> &'a mut T: Id
     let _y = x.id();
     // Inspecting the trace should show that _y has a type involving a local lifetime, when it gets validated.
     // Unfortunately, there doesn't seem to be a way to actually have a test fail if it does not have the right
-    // type.  Currently, this is NOT working correctly; see <https://github.com/solson/miri/issues/298>.
+    // type.  Currently, this is NOT working correctly; see <https://github.com/rust-lang/miri/issues/298>.
 }
 
 fn main() {