diff --git a/Cargo.toml b/Cargo.toml
index 6349217..b23afe3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,8 +14,9 @@ log  = "*"
 [dependencies.glx]
 git = "https://github.com/servo/rust-glx"
 
-[dependencies.xlib]
-git = "https://github.com/servo/rust-xlib"
+[dependencies.x11]
+version = "1.0.0"
+features = ["xlib"]
 
 [dependencies.cgl]
 git = "https://github.com/servo/rust-cgl"
diff --git a/src/lib.rs b/src/lib.rs
index 102f30b..ccb4a22 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -3,7 +3,7 @@ extern crate libc;
 extern crate geom;
 
 #[cfg(target_os="linux")]
-extern crate xlib;
+extern crate x11;
 #[cfg(target_os="linux")]
 extern crate glx;
 #[cfg(target_os="macos")]
diff --git a/src/platform/with_glx/native_gl_context.rs b/src/platform/with_glx/native_gl_context.rs
index 5fe644e..bfc7e1d 100644
--- a/src/platform/with_glx/native_gl_context.rs
+++ b/src/platform/with_glx/native_gl_context.rs
@@ -1,5 +1,5 @@
 use glx;
-use xlib::*;
+use x11::xlib::*;
 use libc::*;
 use glx::types::{GLXContext, GLXDrawable, GLXFBConfig, GLXPixmap};
 use geom::{Size2D};
diff --git a/src/platform/with_glx/utils.rs b/src/platform/with_glx/utils.rs
index b24d3da..8cf5d82 100644
--- a/src/platform/with_glx/utils.rs
+++ b/src/platform/with_glx/utils.rs
@@ -1,5 +1,5 @@
 use glx;
-use xlib::*;
+use x11::xlib::*;
 use glx::types::{GLXDrawable};
 use libc::*;
 use geom::{Size2D};