diff --git a/Cargo.lock b/Cargo.lock
index c75b3c44..8e28591d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -243,7 +243,7 @@ dependencies = [
  "pathfinder_gpu 0.5.0",
  "pathfinder_renderer 0.5.0",
  "pathfinder_resources 0.5.0",
- "surfman 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "surfman 0.2.0 (git+https://github.com/servo/surfman?rev=f3df871ac8c3926fe9106d86a3e51e20aa50d3cc)",
  "winit 0.19.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -261,7 +261,7 @@ dependencies = [
  "pathfinder_gpu 0.5.0",
  "pathfinder_renderer 0.5.0",
  "pathfinder_resources 0.5.0",
- "surfman 0.2.0 (git+https://github.com/pcwalton/surfman?rev=616b9e020585dd650120fb1e6cceb0e2bb43199a)",
+ "surfman 0.2.0 (git+https://github.com/servo/surfman?rev=f3df871ac8c3926fe9106d86a3e51e20aa50d3cc)",
  "winit 0.19.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -285,7 +285,7 @@ dependencies = [
  "pathfinder_renderer 0.5.0",
  "pathfinder_resources 0.5.0",
  "pathfinder_simd 0.5.0",
- "surfman 0.2.0 (git+https://github.com/pcwalton/surfman?rev=bc29e7ae88ca7dd64d3b1c7e185604693290207f)",
+ "surfman 0.2.0 (git+https://github.com/servo/surfman?rev=f3df871ac8c3926fe9106d86a3e51e20aa50d3cc)",
  "winit 0.19.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -659,7 +659,7 @@ dependencies = [
  "pathfinder_resources 0.5.0",
  "pathfinder_simd 0.5.0",
  "pretty_env_logger 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "surfman 0.2.0 (git+https://github.com/pcwalton/surfman?rev=616b9e020585dd650120fb1e6cceb0e2bb43199a)",
+ "surfman 0.2.0 (git+https://github.com/servo/surfman?rev=f3df871ac8c3926fe9106d86a3e51e20aa50d3cc)",
  "winit 0.19.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -936,16 +936,6 @@ dependencies = [
  "gl_generator 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "gl_generator"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "khronos_api 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "xml-rs 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "gl_generator"
 version = "0.13.1"
@@ -2461,7 +2451,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "surfman"
 version = "0.2.0"
-source = "git+https://github.com/pcwalton/surfman?rev=616b9e020585dd650120fb1e6cceb0e2bb43199a#616b9e020585dd650120fb1e6cceb0e2bb43199a"
+source = "git+https://github.com/servo/surfman?rev=f3df871ac8c3926fe9106d86a3e51e20aa50d3cc#f3df871ac8c3926fe9106d86a3e51e20aa50d3cc"
 dependencies = [
  "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "cfg_aliases 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2487,60 +2477,6 @@ dependencies = [
  "x11 2.18.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "surfman"
-version = "0.2.0"
-source = "git+https://github.com/pcwalton/surfman?rev=bc29e7ae88ca7dd64d3b1c7e185604693290207f#bc29e7ae88ca7dd64d3b1c7e185604693290207f"
-dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cgl 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "cocoa 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "display-link 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.20.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "io-surface 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "mach 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-sys 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winit 0.19.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "wio 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "x11 2.18.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "surfman"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cgl 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "cocoa 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "display-link 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.20.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "io-surface 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "mach 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-sys 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winit 0.19.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "wio 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "x11 2.18.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "svg-to-skia"
 version = "0.1.0"
@@ -3197,7 +3133,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum gif 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)" = "471d90201b3b223f3451cd4ad53e34295f16a1df17b1edf3736d47761c3981af"
 "checksum gimli 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "81dd6190aad0f05ddbbf3245c54ed14ca4aa6dd32f22312b70d8f168c3e3e633"
 "checksum gl 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a94edab108827d67608095e269cf862e60d920f144a5026d3dbcfd8b877fb404"
-"checksum gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "39a23d5e872a275135d66895d954269cf5e8661d234eb1c2480f4ce0d586acbd"
 "checksum gl_generator 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ca98bbde17256e02d17336a6bdb5a50f7d0ccacee502e191d3e3d0ec2f96f84a"
 "checksum gl_generator 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d"
 "checksum gleam 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9ea4f9ba7411ae3f00516401fb811b4f4f37f5c926357f2a033d27f96b74c849"
@@ -3339,9 +3274,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum static_assertions 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7f3eb36b47e512f8f1c9e3d10c2c1965bc992bd9cdb024fa581e2194501c83d3"
 "checksum stb_truetype 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f77b6b07e862c66a9f3e62a07588fee67cd90a9135a2b942409f195507b4fb51"
 "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-"checksum surfman 0.2.0 (git+https://github.com/pcwalton/surfman?rev=616b9e020585dd650120fb1e6cceb0e2bb43199a)" = "<none>"
-"checksum surfman 0.2.0 (git+https://github.com/pcwalton/surfman?rev=bc29e7ae88ca7dd64d3b1c7e185604693290207f)" = "<none>"
-"checksum surfman 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d28b4931b29b2c65fcce61898d6b4dbae2337a60308176c2d5cbff0913740d4a"
+"checksum surfman 0.2.0 (git+https://github.com/servo/surfman?rev=f3df871ac8c3926fe9106d86a3e51e20aa50d3cc)" = "<none>"
 "checksum svgtypes 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9c536faaff1a10837cfe373142583f6e27d81e96beba339147e77b67c9f260ff"
 "checksum swf-fixed 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6b212c20df50b382c442a4098d7d9f1c94f0b040f0f0a5d120fa3a82fa51e302"
 "checksum swf-parser 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "847c41c7add3a5a64524fa5883ba4f2ecaccb2e429df9a3d4ed17ad8e379c15f"
diff --git a/demo/native/Cargo.toml b/demo/native/Cargo.toml
index b3b48bfa..9c698082 100644
--- a/demo/native/Cargo.toml
+++ b/demo/native/Cargo.toml
@@ -38,8 +38,8 @@ path = "../../resources"
 path = "../../simd"
 
 [dependencies.surfman]
-git = "https://github.com/pcwalton/surfman"
-rev = "616b9e020585dd650120fb1e6cceb0e2bb43199a"
+git = "https://github.com/servo/surfman"
+rev = "f3df871ac8c3926fe9106d86a3e51e20aa50d3cc"
 features = ["sm-winit", "sm-x11"]
 
 [dependencies.winit]
diff --git a/examples/canvas_minimal/Cargo.toml b/examples/canvas_minimal/Cargo.toml
index 3aa1baf0..16fe8ee8 100644
--- a/examples/canvas_minimal/Cargo.toml
+++ b/examples/canvas_minimal/Cargo.toml
@@ -36,7 +36,8 @@ path = "../../renderer"
 path = "../../resources"
 
 [dependencies.surfman]
-version = "0.2"
+git = "https://github.com/servo/surfman"
+rev = "f3df871ac8c3926fe9106d86a3e51e20aa50d3cc"
 features = ["sm-winit", "sm-x11"]
 
 [dependencies.winit]
diff --git a/examples/canvas_moire/Cargo.toml b/examples/canvas_moire/Cargo.toml
index 1ecc4a9e..01a96c5b 100644
--- a/examples/canvas_moire/Cargo.toml
+++ b/examples/canvas_moire/Cargo.toml
@@ -37,8 +37,8 @@ path = "../../renderer"
 path = "../../resources"
 
 [dependencies.surfman]
-git = "https://github.com/pcwalton/surfman"
-rev = "616b9e020585dd650120fb1e6cceb0e2bb43199a"
+git = "https://github.com/servo/surfman"
+rev = "f3df871ac8c3926fe9106d86a3e51e20aa50d3cc"
 features = ["sm-winit", "sm-x11"]
 
 [dependencies.winit]
diff --git a/examples/canvas_nanovg/Cargo.toml b/examples/canvas_nanovg/Cargo.toml
index abae2954..6a0a8338 100644
--- a/examples/canvas_nanovg/Cargo.toml
+++ b/examples/canvas_nanovg/Cargo.toml
@@ -51,8 +51,8 @@ path = "../../resources"
 path = "../../simd"
 
 [dependencies.surfman]
-git = "https://github.com/pcwalton/surfman"
-rev = "bc29e7ae88ca7dd64d3b1c7e185604693290207f"
+git = "https://github.com/servo/surfman"
+rev = "f3df871ac8c3926fe9106d86a3e51e20aa50d3cc"
 features = ["sm-winit", "sm-x11"]
 
 [dependencies.winit]