diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml
index 34451e67931..c67c8ea8733 100644
--- a/components/canvas/Cargo.toml
+++ b/components/canvas/Cargo.toml
@@ -34,7 +34,7 @@ git = "https://github.com/ecoal95/rust-offscreen-rendering-context"
 git = "https://github.com/servo/ipc-channel"
 
 [dependencies.webrender_traits]
-git = "https://github.com/glennw/webrender_traits"
+git = "https://github.com/servo/webrender_traits"
 
 [dependencies]
 log = "0.3"
diff --git a/components/canvas_traits/Cargo.toml b/components/canvas_traits/Cargo.toml
index d1985af2a6b..c159707a537 100644
--- a/components/canvas_traits/Cargo.toml
+++ b/components/canvas_traits/Cargo.toml
@@ -35,7 +35,7 @@ path = "../plugins"
 path = "../util"
 
 [dependencies.webrender_traits]
-git = "https://github.com/glennw/webrender_traits"
+git = "https://github.com/servo/webrender_traits"
 
 [dependencies]
 cssparser = {version = "0.5.3", features = ["heap_size", "serde-serialization"]}
diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml
index 389b669d607..abbd3f430f5 100644
--- a/components/compositing/Cargo.toml
+++ b/components/compositing/Cargo.toml
@@ -82,10 +82,10 @@ git = "https://github.com/servo/gaol"
 git = "https://github.com/servo/gaol"
 
 [dependencies.webrender_traits]
-git = "https://github.com/glennw/webrender_traits"
+git = "https://github.com/servo/webrender_traits"
 
 [dependencies.webrender]
-git = "https://github.com/glennw/webrender"
+git = "https://github.com/servo/webrender"
 
 [dependencies]
 app_units = {version = "0.2.1", features = ["plugins"]}
diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml
index 58863a275c1..f66ca8c658b 100644
--- a/components/gfx/Cargo.toml
+++ b/components/gfx/Cargo.toml
@@ -70,7 +70,7 @@ features = ["plugins"]
 git = "https://github.com/servo/ipc-channel"
 
 [dependencies.webrender_traits]
-git = "https://github.com/glennw/webrender_traits"
+git = "https://github.com/servo/webrender_traits"
 
 [target.x86_64-apple-darwin.dependencies]
 core-foundation = "0.2"
diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml
index e58cac00aa5..ff709ffafcc 100644
--- a/components/layout/Cargo.toml
+++ b/components/layout/Cargo.toml
@@ -57,7 +57,7 @@ path = "../util"
 git = "https://github.com/servo/ipc-channel"
 
 [dependencies.webrender_traits]
-git = "https://github.com/glennw/webrender_traits"
+git = "https://github.com/servo/webrender_traits"
 
 [dependencies]
 app_units = {version = "0.2.1", features = ["plugins"]}
diff --git a/components/layout_traits/Cargo.toml b/components/layout_traits/Cargo.toml
index 1afb7d9b920..1f3a570b60c 100644
--- a/components/layout_traits/Cargo.toml
+++ b/components/layout_traits/Cargo.toml
@@ -29,7 +29,7 @@ path = "../util"
 git = "https://github.com/servo/ipc-channel"
 
 [dependencies.webrender_traits]
-git = "https://github.com/glennw/webrender_traits"
+git = "https://github.com/servo/webrender_traits"
 
 [dependencies]
 serde = "0.6"
diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml
index 05f84756a5f..5ad3de60a52 100644
--- a/components/msg/Cargo.toml
+++ b/components/msg/Cargo.toml
@@ -21,7 +21,7 @@ git = "https://github.com/servo/ipc-channel"
 path = "../plugins"
 
 [dependencies.webrender_traits]
-git = "https://github.com/glennw/webrender_traits"
+git = "https://github.com/servo/webrender_traits"
 
 [dependencies]
 bitflags = "0.3"
diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml
index 5dc0f3ea1f7..ef04193afc3 100644
--- a/components/net/Cargo.toml
+++ b/components/net/Cargo.toml
@@ -29,7 +29,7 @@ path = "../msg"
 git = "https://github.com/servo/ipc-channel"
 
 [dependencies.webrender_traits]
-git = "https://github.com/glennw/webrender_traits"
+git = "https://github.com/servo/webrender_traits"
 
 [dependencies]
 hyper = { version = "0.7", features = [ "serde-serialization" ] }
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index 8eaa580cf56..b907fe381ae 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -42,8 +42,8 @@ dependencies = [
  "util 0.0.1",
  "util_tests 0.0.1",
  "webdriver_server 0.0.1",
- "webrender 0.1.0 (git+https://github.com/glennw/webrender)",
- "webrender_traits 0.1.0 (git+https://github.com/glennw/webrender_traits)",
+ "webrender 0.1.0 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
 ]
 
 [[package]]
@@ -162,7 +162,7 @@ dependencies = [
  "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
  "plugins 0.0.1",
  "util 0.0.1",
- "webrender_traits 0.1.0 (git+https://github.com/glennw/webrender_traits)",
+ "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
 ]
 
 [[package]]
@@ -182,7 +182,7 @@ dependencies = [
  "serde 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
- "webrender_traits 0.1.0 (git+https://github.com/glennw/webrender_traits)",
+ "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
 ]
 
 [[package]]
@@ -296,8 +296,8 @@ dependencies = [
  "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
- "webrender 0.1.0 (git+https://github.com/glennw/webrender)",
- "webrender_traits 0.1.0 (git+https://github.com/glennw/webrender_traits)",
+ "webrender 0.1.0 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
 ]
 
 [[package]]
@@ -681,7 +681,7 @@ dependencies = [
  "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
- "webrender_traits 0.1.0 (git+https://github.com/glennw/webrender_traits)",
+ "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
 ]
 
 [[package]]
@@ -1024,7 +1024,7 @@ dependencies = [
  "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
- "webrender_traits 0.1.0 (git+https://github.com/glennw/webrender_traits)",
+ "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
 ]
 
 [[package]]
@@ -1041,7 +1041,7 @@ dependencies = [
  "serde_macros 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
- "webrender_traits 0.1.0 (git+https://github.com/glennw/webrender_traits)",
+ "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
 ]
 
 [[package]]
@@ -1202,7 +1202,7 @@ dependencies = [
  "serde_macros 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
- "webrender_traits 0.1.0 (git+https://github.com/glennw/webrender_traits)",
+ "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
 ]
 
 [[package]]
@@ -1227,7 +1227,7 @@ dependencies = [
  "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
  "uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_traits 0.1.0 (git+https://github.com/glennw/webrender_traits)",
+ "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
  "websocket 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2207,7 +2207,7 @@ dependencies = [
 [[package]]
 name = "webrender"
 version = "0.1.0"
-source = "git+https://github.com/glennw/webrender#463d6e361a0b29d4b0f0f972510cf588d0bc27b0"
+source = "git+https://github.com/servo/webrender#c05e4d6458609bd6ecab3fea644cdd299a830032"
 dependencies = [
  "app_units 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-graphics 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2222,13 +2222,13 @@ dependencies = [
  "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
  "scoped_threadpool 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_traits 0.1.0 (git+https://github.com/glennw/webrender_traits)",
+ "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
 ]
 
 [[package]]
 name = "webrender_traits"
 version = "0.1.0"
-source = "git+https://github.com/glennw/webrender_traits#8ccc1608590d219d1df54e49f2f1e887995b4d60"
+source = "git+https://github.com/servo/webrender_traits#8ccc1608590d219d1df54e49f2f1e887995b4d60"
 dependencies = [
  "app_units 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-graphics 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
index 9bea00cd956..b5d136809ba 100644
--- a/components/servo/Cargo.toml
+++ b/components/servo/Cargo.toml
@@ -53,10 +53,10 @@ path = "../../tests/reftest.rs"
 harness = false
 
 [dependencies.webrender_traits]
-git = "https://github.com/glennw/webrender_traits"
+git = "https://github.com/servo/webrender_traits"
 
 [dependencies.webrender]
-git = "https://github.com/glennw/webrender"
+git = "https://github.com/servo/webrender"
 
 [features]
 default = ["glutin_app", "window", "webdriver"]
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index 279a83c564b..c41beaeb2e3 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -149,7 +149,7 @@ dependencies = [
  "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
  "plugins 0.0.1",
  "util 0.0.1",
- "webrender_traits 0.1.0 (git+https://github.com/glennw/webrender_traits)",
+ "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
 ]
 
 [[package]]
@@ -169,7 +169,7 @@ dependencies = [
  "serde 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
- "webrender_traits 0.1.0 (git+https://github.com/glennw/webrender_traits)",
+ "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
 ]
 
 [[package]]
@@ -268,8 +268,8 @@ dependencies = [
  "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
- "webrender 0.1.0 (git+https://github.com/glennw/webrender)",
- "webrender_traits 0.1.0 (git+https://github.com/glennw/webrender_traits)",
+ "webrender 0.1.0 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
 ]
 
 [[package]]
@@ -620,7 +620,7 @@ dependencies = [
  "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
- "webrender_traits 0.1.0 (git+https://github.com/glennw/webrender_traits)",
+ "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
 ]
 
 [[package]]
@@ -954,7 +954,7 @@ dependencies = [
  "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
- "webrender_traits 0.1.0 (git+https://github.com/glennw/webrender_traits)",
+ "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
 ]
 
 [[package]]
@@ -971,7 +971,7 @@ dependencies = [
  "serde_macros 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
- "webrender_traits 0.1.0 (git+https://github.com/glennw/webrender_traits)",
+ "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
 ]
 
 [[package]]
@@ -1132,7 +1132,7 @@ dependencies = [
  "serde_macros 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
- "webrender_traits 0.1.0 (git+https://github.com/glennw/webrender_traits)",
+ "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
 ]
 
 [[package]]
@@ -1157,7 +1157,7 @@ dependencies = [
  "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
  "uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_traits 0.1.0 (git+https://github.com/glennw/webrender_traits)",
+ "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
  "websocket 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1634,8 +1634,8 @@ dependencies = [
  "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
  "webdriver_server 0.0.1",
- "webrender 0.1.0 (git+https://github.com/glennw/webrender)",
- "webrender_traits 0.1.0 (git+https://github.com/glennw/webrender_traits)",
+ "webrender 0.1.0 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
 ]
 
 [[package]]
@@ -2093,7 +2093,7 @@ dependencies = [
 [[package]]
 name = "webrender"
 version = "0.1.0"
-source = "git+https://github.com/glennw/webrender#463d6e361a0b29d4b0f0f972510cf588d0bc27b0"
+source = "git+https://github.com/servo/webrender#c05e4d6458609bd6ecab3fea644cdd299a830032"
 dependencies = [
  "app_units 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-graphics 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2108,13 +2108,13 @@ dependencies = [
  "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
  "scoped_threadpool 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_traits 0.1.0 (git+https://github.com/glennw/webrender_traits)",
+ "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
 ]
 
 [[package]]
 name = "webrender_traits"
 version = "0.1.0"
-source = "git+https://github.com/glennw/webrender_traits#8ccc1608590d219d1df54e49f2f1e887995b4d60"
+source = "git+https://github.com/servo/webrender_traits#8ccc1608590d219d1df54e49f2f1e887995b4d60"
 dependencies = [
  "app_units 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-graphics 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock
index a3c34aaf46f..9a374139ebb 100644
--- a/ports/gonk/Cargo.lock
+++ b/ports/gonk/Cargo.lock
@@ -141,7 +141,7 @@ dependencies = [
  "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
  "plugins 0.0.1",
  "util 0.0.1",
- "webrender_traits 0.1.0 (git+https://github.com/glennw/webrender_traits)",
+ "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
 ]
 
 [[package]]
@@ -161,7 +161,7 @@ dependencies = [
  "serde 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
- "webrender_traits 0.1.0 (git+https://github.com/glennw/webrender_traits)",
+ "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
 ]
 
 [[package]]
@@ -260,8 +260,8 @@ dependencies = [
  "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
- "webrender 0.1.0 (git+https://github.com/glennw/webrender)",
- "webrender_traits 0.1.0 (git+https://github.com/glennw/webrender_traits)",
+ "webrender 0.1.0 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
 ]
 
 [[package]]
@@ -622,7 +622,7 @@ dependencies = [
  "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
- "webrender_traits 0.1.0 (git+https://github.com/glennw/webrender_traits)",
+ "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
 ]
 
 [[package]]
@@ -935,7 +935,7 @@ dependencies = [
  "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
- "webrender_traits 0.1.0 (git+https://github.com/glennw/webrender_traits)",
+ "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
 ]
 
 [[package]]
@@ -952,7 +952,7 @@ dependencies = [
  "serde_macros 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
- "webrender_traits 0.1.0 (git+https://github.com/glennw/webrender_traits)",
+ "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
 ]
 
 [[package]]
@@ -1113,7 +1113,7 @@ dependencies = [
  "serde_macros 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
- "webrender_traits 0.1.0 (git+https://github.com/glennw/webrender_traits)",
+ "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
 ]
 
 [[package]]
@@ -1138,7 +1138,7 @@ dependencies = [
  "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
  "uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_traits 0.1.0 (git+https://github.com/glennw/webrender_traits)",
+ "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
  "websocket 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1613,8 +1613,8 @@ dependencies = [
  "style 0.0.1",
  "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
- "webrender 0.1.0 (git+https://github.com/glennw/webrender)",
- "webrender_traits 0.1.0 (git+https://github.com/glennw/webrender_traits)",
+ "webrender 0.1.0 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
 ]
 
 [[package]]
@@ -2041,7 +2041,7 @@ dependencies = [
 [[package]]
 name = "webrender"
 version = "0.1.0"
-source = "git+https://github.com/glennw/webrender#463d6e361a0b29d4b0f0f972510cf588d0bc27b0"
+source = "git+https://github.com/servo/webrender#c05e4d6458609bd6ecab3fea644cdd299a830032"
 dependencies = [
  "app_units 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-graphics 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2056,13 +2056,13 @@ dependencies = [
  "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
  "scoped_threadpool 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_traits 0.1.0 (git+https://github.com/glennw/webrender_traits)",
+ "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
 ]
 
 [[package]]
 name = "webrender_traits"
 version = "0.1.0"
-source = "git+https://github.com/glennw/webrender_traits#8ccc1608590d219d1df54e49f2f1e887995b4d60"
+source = "git+https://github.com/servo/webrender_traits#8ccc1608590d219d1df54e49f2f1e887995b4d60"
 dependencies = [
  "app_units 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-graphics 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",