diff --git a/Cargo.lock b/Cargo.lock
index 0079321be3..ce4db3af9d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2550,14 +2550,15 @@ dependencies = [
 [[package]]
 name = "keyboard-keynames"
 version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6dbe132877d7a0327c4282840703c2cb456312fae930898b5dc126844889626"
+source = "git+https://gitlab.com/Frinksy/keyboard-keynames.git?rev=a97ae509cdb9dc70cf1bf0af762d2d1d3a0d6e0c#a97ae509cdb9dc70cf1bf0af762d2d1d3a0d6e0c"
 dependencies = [
+ "libc",
+ "memmap",
  "wayland-client 0.28.5",
  "winapi 0.3.9",
  "winit",
- "xcb 0.8.2",
- "xkbcommon",
+ "xcb",
+ "xkbcommon-sys 0.7.5",
 ]
 
 [[package]]
@@ -2872,7 +2873,7 @@ dependencies = [
  "winapi 0.3.9",
  "x11-dl",
  "xkb",
- "xkbcommon-sys",
+ "xkbcommon-sys 0.7.4",
 ]
 
 [[package]]
@@ -6483,7 +6484,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5e937afd03b64b7be4f959cc044e09260a47241b71e56933f37db097bf7859d"
 dependencies = [
- "xcb 0.9.0",
+ "xcb",
 ]
 
 [[package]]
@@ -6519,16 +6520,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "xcb"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e917a3f24142e9ff8be2414e36c649d47d6cc2ba81f16201cdef96e533e02de"
-dependencies = [
- "libc",
- "log",
-]
-
 [[package]]
 name = "xcb"
 version = "0.9.0"
@@ -6568,18 +6559,7 @@ checksum = "aec02bc5de902aa579f3d2f2c522edaf40fa42963cbaffe645b058ddcc68fdb2"
 dependencies = [
  "bitflags",
  "libc",
- "xkbcommon-sys",
-]
-
-[[package]]
-name = "xkbcommon"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fda0ea5f7ddabd51deeeda7799bee06274112f577da7dd3d954b8eda731b2fce"
-dependencies = [
- "libc",
- "memmap",
- "xcb 0.8.2",
+ "xkbcommon-sys 0.7.4",
 ]
 
 [[package]]
@@ -6592,6 +6572,15 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "xkbcommon-sys"
+version = "0.7.5"
+source = "git+https://github.com/Frinksy/rust-xkbcommon-sys.git?rev=d5d69e05a81f7ee8d2f65a824ae692610ed7cb14#d5d69e05a81f7ee8d2f65a824ae692610ed7cb14"
+dependencies = [
+ "libc",
+ "pkg-config",
+]
+
 [[package]]
 name = "xml-rs"
 version = "0.8.3"
diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml
index 06cbf713a5..5094d86d61 100644
--- a/voxygen/Cargo.toml
+++ b/voxygen/Cargo.toml
@@ -45,7 +45,7 @@ iced = {package = "iced_native", git = "https://github.com/hecrj/iced", rev = "8
 iced_winit = {git = "https://github.com/hecrj/iced", rev = "8d882d787e6b7fd7c2435f42f82933e2ed904edf"}
 window_clipboard = "0.2"
 glyph_brush = "0.7.0"
-keyboard-keynames = "0.1.0"
+keyboard-keynames = { git = "https://gitlab.com/Frinksy/keyboard-keynames.git", rev = "a97ae509cdb9dc70cf1bf0af762d2d1d3a0d6e0c" }
 
 # ECS
 specs = {git = "https://github.com/amethyst/specs.git", rev = "5a9b71035007be0e3574f35184acac1cd4530496"}