diff --git a/Cargo.lock b/Cargo.lock
index a01dcbe27..7f4d99646 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,5 +1,3 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
 [[package]]
 name = "ansi_term"
 version = "0.9.0"
@@ -12,7 +10,7 @@ dependencies = [
  "arch_gen 0.1.0",
  "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "kvm-bindings 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "kvm-ioctls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "kvm-ioctls 0.1.0 (git+https://github.com/rust-vmm/kvm-ioctls)",
  "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
  "vm-memory 0.1.0 (git+https://github.com/rust-vmm/vm-memory)",
 ]
@@ -233,7 +231,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "kvm-ioctls"
 version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/rust-vmm/kvm-ioctls#e7a0ccc463ab8d311aec2f7b2560fa18ed47a0eb"
 dependencies = [
  "kvm-bindings 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -331,7 +329,7 @@ dependencies = [
  "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "devices 0.1.0",
  "kvm-bindings 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "kvm-ioctls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "kvm-ioctls 0.1.0 (git+https://github.com/rust-vmm/kvm-ioctls)",
  "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "vm-allocator 0.1.0",
@@ -667,7 +665,7 @@ dependencies = [
  "devices 0.1.0",
  "epoll 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "kvm-bindings 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "kvm-ioctls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "kvm-ioctls 0.1.0 (git+https://github.com/rust-vmm/kvm-ioctls)",
  "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
  "linux-loader 0.1.0 (git+https://github.com/bjzhjing/linux-loader)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -733,7 +731,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
 "checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 "checksum kvm-bindings 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c223e8703d2eb76d990c5f58e29c85b0f6f50e24b823babde927948e7c71fc03"
-"checksum kvm-ioctls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f87b0c7322658f94e9fcf661146c9761a487813f3154e6a67a24fc59c68f5306"
+"checksum kvm-ioctls 0.1.0 (git+https://github.com/rust-vmm/kvm-ioctls)" = "<none>"
 "checksum libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "6281b86796ba5e4366000be6e9e18bf35580adf9e63fbe2294aadb587613a319"
 "checksum libssh2-sys 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "126a1f4078368b163bfdee65fbab072af08a1b374a5551b21e87ade27b1fbf9d"
 "checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"
diff --git a/arch/Cargo.toml b/arch/Cargo.toml
index 1284e52aa..1e62413ab 100644
--- a/arch/Cargo.toml
+++ b/arch/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["The Chromium OS Authors"]
 [dependencies]
 byteorder = "=1.2.1"
 kvm-bindings = "0.1"
-kvm-ioctls = "0.1.0"
+kvm-ioctls = { git = "https://github.com/rust-vmm/kvm-ioctls", branch = "master" }
 libc = ">=0.2.39"
 
 arch_gen = { path = "../arch_gen" }
diff --git a/pci/Cargo.toml b/pci/Cargo.toml
index 968175f70..84a3c5ddb 100644
--- a/pci/Cargo.toml
+++ b/pci/Cargo.toml
@@ -9,7 +9,7 @@ vm-allocator = { path = "../vm-allocator" }
 byteorder = "*"
 devices = { path = "../devices" }
 kvm-bindings = "0.1"
-kvm-ioctls = "0.1.0"
+kvm-ioctls = { git = "https://github.com/rust-vmm/kvm-ioctls", branch = "master" }
 libc = ">=0.2.39"
 log = "*"
 vm-memory = { git = "https://github.com/rust-vmm/vm-memory" }
diff --git a/vmm/Cargo.toml b/vmm/Cargo.toml
index 3206bc328..ad513671e 100755
--- a/vmm/Cargo.toml
+++ b/vmm/Cargo.toml
@@ -9,7 +9,7 @@ arch = { path = "../arch" }
 devices = { path = "../devices" }
 epoll = "=4.0.1"
 kvm-bindings = "0.1"
-kvm-ioctls = "0.1.0"
+kvm-ioctls = { git = "https://github.com/rust-vmm/kvm-ioctls", branch = "master" }
 libc = ">=0.2.39"
 log = "*"
 net_util = { path = "../net_util" }
diff --git a/vmm/src/vm.rs b/vmm/src/vm.rs
index cc7d96709..db96f6cc2 100755
--- a/vmm/src/vm.rs
+++ b/vmm/src/vm.rs
@@ -573,7 +573,7 @@ impl<'a> Vm<'a> {
                 };
 
                 // Safe because the guest regions are guaranteed not to overlap.
-                fd.set_user_memory_region(mem_region)
+                unsafe { fd.set_user_memory_region(mem_region) }
             })
             .map_err(|_| Error::GuestMemory(MmapError::NoMemoryRegion))?;
 
@@ -838,7 +838,7 @@ pub fn test_vm() {
         };
 
         // Safe because the guest regions are guaranteed not to overlap.
-        vm_fd.set_user_memory_region(mem_region)
+        unsafe { vm_fd.set_user_memory_region(mem_region) }
     })
     .expect("Cannot configure guest memory");
     mem.write_slice(&code, load_addr)