diff --git a/ORGANIZATION.md b/ORGANIZATION.md
index 14a99a37fff..d40d71fcdee 100644
--- a/ORGANIZATION.md
+++ b/ORGANIZATION.md
@@ -100,7 +100,7 @@
 * <https://github.com/servo/rust-mozjs/>, <https://github.com/servo/mozjs/>: bindings to SpiderMonkey
 * <https://github.com/hyperium/hyper/>: an HTTP implementation
 * <https://github.com/servo/html5ever/>: an HTML5 parser
-* <https://github.com/pcwalton/ipc-channel/>: an IPC implementation
+* <https://github.com/servo/ipc-channel/>: an IPC implementation
 * <https://github.com/PistonDevelopers/image/>: image decoders
 * <https://github.com/tomaka/glutin/>: cross-platform windowing and input
 * <https://github.com/servo/rust-azure/>: bindings to Moz2D/Azure (cross-platform 2D rendering library)
diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml
index 708fd6fd6ad..7c2d91a5d6c 100644
--- a/components/compositing/Cargo.toml
+++ b/components/compositing/Cargo.toml
@@ -64,22 +64,22 @@ git = "https://github.com/servo/ipc-channel"
 git = "https://github.com/ecoal95/rust-offscreen-rendering-context"
 
 [target.arm-linux-androideabi.dependencies.gaol]
-git = "https://github.com/pcwalton/gaol"
+git = "https://github.com/servo/gaol"
 
 [target.x86_64-apple-darwin.dependencies.gaol]
-git = "https://github.com/pcwalton/gaol"
+git = "https://github.com/servo/gaol"
 
 [target.x86_64-unknown-linux-gnu.dependencies.gaol]
-git = "https://github.com/pcwalton/gaol"
+git = "https://github.com/servo/gaol"
 
 [target.i686-unknown-linux-gnu.dependencies.gaol]
-git = "https://github.com/pcwalton/gaol"
+git = "https://github.com/servo/gaol"
 
 [target.arm-unknown-linux-gnueabihf.dependencies.gaol]
-git = "https://github.com/pcwalton/gaol"
+git = "https://github.com/servo/gaol"
 
 [target.aarch64-unknown-linux-gnu.dependencies.gaol]
-git = "https://github.com/pcwalton/gaol"
+git = "https://github.com/servo/gaol"
 
 [dependencies]
 app_units = {version = "0.1", features = ["plugins"]}
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index c0777983ce8..fe810d3d674 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -11,7 +11,7 @@ dependencies = [
  "devtools_traits 0.0.1",
  "env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gaol 0.0.1 (git+https://github.com/pcwalton/gaol)",
+ "gaol 0.0.1 (git+https://github.com/servo/gaol)",
  "gfx 0.0.1",
  "gfx_tests 0.0.1",
  "gleam 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -249,7 +249,7 @@ dependencies = [
  "core-text 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "devtools_traits 0.0.1",
  "euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gaol 0.0.1 (git+https://github.com/pcwalton/gaol)",
+ "gaol 0.0.1 (git+https://github.com/servo/gaol)",
  "gfx 0.0.1",
  "gfx_traits 0.0.1",
  "gleam 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -584,7 +584,7 @@ dependencies = [
 [[package]]
 name = "gaol"
 version = "0.0.1"
-source = "git+https://github.com/pcwalton/gaol#e1349d8d3d933b3a90f9c86baa390261c510e019"
+source = "git+https://github.com/servo/gaol#e1349d8d3d933b3a90f9c86baa390261c510e019"
 dependencies = [
  "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
index e2c8c6766b8..606fc097c0a 100644
--- a/components/servo/Cargo.toml
+++ b/components/servo/Cargo.toml
@@ -126,22 +126,22 @@ version = "0.3"
 features = ["release_max_level_info"]
 
 [target.arm-linux-androideabi.dependencies.gaol]
-git = "https://github.com/pcwalton/gaol"
+git = "https://github.com/servo/gaol"
 
 [target.x86_64-apple-darwin.dependencies.gaol]
-git = "https://github.com/pcwalton/gaol"
+git = "https://github.com/servo/gaol"
 
 [target.x86_64-unknown-linux-gnu.dependencies.gaol]
-git = "https://github.com/pcwalton/gaol"
+git = "https://github.com/servo/gaol"
 
 [target.i686-unknown-linux-gnu.dependencies.gaol]
-git = "https://github.com/pcwalton/gaol"
+git = "https://github.com/servo/gaol"
 
 [target.arm-unknown-linux-gnueabihf.dependencies.gaol]
-git = "https://github.com/pcwalton/gaol"
+git = "https://github.com/servo/gaol"
 
 [target.aarch64-unknown-linux-gnu.dependencies.gaol]
-git = "https://github.com/pcwalton/gaol"
+git = "https://github.com/servo/gaol"
 
 [dependencies.ipc-channel]
 git = "https://github.com/servo/ipc-channel"
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index f266f78660b..aebba34aa5f 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -250,7 +250,7 @@ dependencies = [
  "core-text 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "devtools_traits 0.0.1",
  "euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gaol 0.0.1 (git+https://github.com/pcwalton/gaol)",
+ "gaol 0.0.1 (git+https://github.com/servo/gaol)",
  "gfx 0.0.1",
  "gfx_traits 0.0.1",
  "gleam 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -552,7 +552,7 @@ dependencies = [
 [[package]]
 name = "gaol"
 version = "0.0.1"
-source = "git+https://github.com/pcwalton/gaol#e1349d8d3d933b3a90f9c86baa390261c510e019"
+source = "git+https://github.com/servo/gaol#e1349d8d3d933b3a90f9c86baa390261c510e019"
 dependencies = [
  "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1553,7 +1553,7 @@ dependencies = [
  "devtools_traits 0.0.1",
  "env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gaol 0.0.1 (git+https://github.com/pcwalton/gaol)",
+ "gaol 0.0.1 (git+https://github.com/servo/gaol)",
  "gfx 0.0.1",
  "gleam 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "glutin_app 0.0.1",
diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock
index 22f1d6acbce..2d355cf7725 100644
--- a/ports/gonk/Cargo.lock
+++ b/ports/gonk/Cargo.lock
@@ -231,7 +231,7 @@ dependencies = [
  "core-text 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "devtools_traits 0.0.1",
  "euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gaol 0.0.1 (git+https://github.com/pcwalton/gaol)",
+ "gaol 0.0.1 (git+https://github.com/servo/gaol)",
  "gfx 0.0.1",
  "gfx_traits 0.0.1",
  "gleam 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -543,7 +543,7 @@ dependencies = [
 [[package]]
 name = "gaol"
 version = "0.0.1"
-source = "git+https://github.com/pcwalton/gaol#e1349d8d3d933b3a90f9c86baa390261c510e019"
+source = "git+https://github.com/servo/gaol#e1349d8d3d933b3a90f9c86baa390261c510e019"
 dependencies = [
  "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1524,7 +1524,7 @@ dependencies = [
  "devtools_traits 0.0.1",
  "env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gaol 0.0.1 (git+https://github.com/pcwalton/gaol)",
+ "gaol 0.0.1 (git+https://github.com/servo/gaol)",
  "gfx 0.0.1",
  "gleam 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.2.0 (git+https://github.com/servo/ipc-channel)",