diff --git a/Cargo.lock b/Cargo.lock
index 65eee136aa0..d41f8c6d064 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4883,9 +4883,9 @@ dependencies = [
 
 [[package]]
 name = "sparkle"
-version = "0.1.8"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25e193f97790240fc9208b077001c8331f4ccc801daa4df56efcb90e513c0989"
+checksum = "84b935631ddcc08b257a331ac645cc6831e52a4ff55d4c430142575c6757a094"
 dependencies = [
  "gl_generator 0.13.1",
 ]
@@ -5069,8 +5069,9 @@ dependencies = [
 
 [[package]]
 name = "surfman"
-version = "0.23.0"
-source = "git+https://github.com/pcwalton/surfman#ffc4e4fda0b58554d4029f0d3d9abe85b42307ed"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7131f4831a7c13f3e90b16b0d7389b8875cc53807312c2697547763bfe7782b8"
 dependencies = [
  "bitflags",
  "cgl 0.3.2",
@@ -5097,7 +5098,8 @@ dependencies = [
 [[package]]
 name = "surfman-chains"
 version = "0.1.0"
-source = "git+https://github.com/asajeffrey/surfman-chains#6b66ad3d4325e76ce9ffcbd79eaf5b5d518902fb"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab6ab2f8da08cd1ca6491fc0fd4c4aedc36adde0d6b3f64a6325b35dfce50ec5"
 dependencies = [
  "euclid",
  "fnv",
@@ -5996,7 +5998,7 @@ dependencies = [
 [[package]]
 name = "webxr"
 version = "0.0.1"
-source = "git+https://github.com/servo/webxr#6545972b8305642b384702726e11198ce5e96be8"
+source = "git+https://github.com/servo/webxr#4953e60dd9ff80324739eee22283d9b80f5c9559"
 dependencies = [
  "bindgen",
  "euclid",
@@ -6015,7 +6017,7 @@ dependencies = [
 [[package]]
 name = "webxr-api"
 version = "0.0.1"
-source = "git+https://github.com/servo/webxr#6545972b8305642b384702726e11198ce5e96be8"
+source = "git+https://github.com/servo/webxr#4953e60dd9ff80324739eee22283d9b80f5c9559"
 dependencies = [
  "euclid",
  "ipc-channel",
diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml
index 6b0f1005b47..d8391bf7858 100644
--- a/components/canvas/Cargo.toml
+++ b/components/canvas/Cargo.toml
@@ -39,5 +39,5 @@ webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
 webrender_traits = {path = "../webrender_traits"}
 webxr-api = {git = "https://github.com/servo/webxr", features = ["ipc"]}
 # NOTE: the sm-angle feature only enables angle on windows, not other platforms!
-surfman = { git = "https://github.com/pcwalton/surfman", features = ["sm-angle", "sm-osmesa"] }
-surfman-chains =  { git = "https://github.com/asajeffrey/surfman-chains" }
+surfman = { version = "0.1", features = ["sm-angle", "sm-osmesa"] }
+surfman-chains = "0.1"
diff --git a/components/canvas/webgl_thread.rs b/components/canvas/webgl_thread.rs
index dbb4988558e..1916111885b 100644
--- a/components/canvas/webgl_thread.rs
+++ b/components/canvas/webgl_thread.rs
@@ -588,6 +588,10 @@ impl WebGLThread {
             swap_chain
                 .resize(&mut self.device, &mut data.ctx, size.to_i32())
                 .expect("Failed to resize swap chain");
+            // temporary, till https://github.com/pcwalton/surfman/issues/35 is fixed
+            self.device
+                .make_context_current(&data.ctx)
+                .expect("Failed to make context current again");
             swap_chain
                 .clear_surface(&mut self.device, &mut data.ctx, &*data.gl)
                 .expect("Failed to clear resized swap chain");
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
index 0ff3ecba8c6..8b56bfbc8d9 100644
--- a/components/servo/Cargo.toml
+++ b/components/servo/Cargo.toml
@@ -82,7 +82,7 @@ webdriver_server = {path = "../webdriver_server", optional = true}
 webvr = {path = "../webvr"}
 webvr_traits = {path = "../webvr_traits"}
 webxr-api = {git = "https://github.com/servo/webxr"}
-surfman = { git = "https://github.com/pcwalton/surfman", features = ["sm-osmesa"] }
+surfman = { version = "0.1", features = ["sm-osmesa"] }
 
 [target.'cfg(all(not(target_os = "windows"), not(target_os = "ios"), not(target_os="android"), not(target_arch="arm"), not(target_arch="aarch64")))'.dependencies]
 gaol = "0.2.1"