diff --git a/Cargo.toml b/Cargo.toml
index dacef718..e0dcaf39 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -85,39 +85,39 @@ osmesa-sys = "0.0.5"
 wayland-client = { version = "0.2.1", features = ["egl", "dlopen"] }
 wayland-kbd = "0.2.0"
 wayland-window = "0.1.0"
-x11-dl = "~2.0"
+x11-dl = "~2.2"
 
 [target.x86_64-unknown-linux-gnu.dependencies]
 osmesa-sys = "0.0.5"
 wayland-client = { version = "0.2.1", features = ["egl", "dlopen"] }
 wayland-kbd = "0.2.0"
 wayland-window = "0.1.0"
-x11-dl = "~2.0"
+x11-dl = "~2.2"
 
 [target.arm-unknown-linux-gnueabihf.dependencies]
 osmesa-sys = "0.0.5"
 wayland-client = { version = "0.2.1", features = ["egl", "dlopen"] }
 wayland-kbd = "0.2.0"
 wayland-window = "0.1.0"
-x11-dl = "~2.0"
+x11-dl = "~2.2"
 
 [target.aarch64-unknown-linux-gnu.dependencies]
 osmesa-sys = "0.0.5"
 wayland-client = { version = "0.2.1", features = ["egl", "dlopen"] }
 wayland-kbd = "0.2.0"
 wayland-window = "0.1.0"
-x11-dl = "~2.0"
+x11-dl = "~2.2"
 
 [target.x86_64-unknown-dragonfly.dependencies]
 osmesa-sys = "0.0.5"
 wayland-client = { version = "0.2.1", features = ["egl", "dlopen"] }
 wayland-kbd = "0.2.0"
 wayland-window = "0.1.0"
-x11-dl = "~2.0"
+x11-dl = "~2.2"
 
 [target.x86_64-unknown-freebsd.dependencies]
 osmesa-sys = "0.0.5"
 wayland-client = { version = "0.2.1", features = ["egl", "dlopen"] }
 wayland-kbd = "0.2.0"
 wayland-window = "0.1.0"
-x11-dl = "~2.0"
+x11-dl = "~2.2"
diff --git a/src/api/x11/window.rs b/src/api/x11/window.rs
index 24dca344..cfe38d13 100644
--- a/src/api/x11/window.rs
+++ b/src/api/x11/window.rs
@@ -535,11 +535,7 @@ impl Window {
                 message_type: state_atom, // the _NET_WM_STATE atom is sent to change the state of a window
                 format: 32,               // view `data` as `c_long`s
                 data: {
-                    // TODO replace this with normal instantiation when x11-rs makes
-                    // ClientMessageData instantiable.
-                    let mut data = unsafe {
-                        mem::transmute::<[libc::c_long; 5], ffi::ClientMessageData>([0; 5])
-                    };
+                    let mut data = ffi::ClientMessageData::new();
                     // This first `long` is the action; `1` means add/set following property.
                     data.set_long(0, 1);
                     // This second `long` is the property to set (fullscreen)