diff --git a/Cargo.lock b/Cargo.lock
index 0f5f5d06ef..ebe65ced91 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -616,7 +616,7 @@ dependencies = [
 [[package]]
 name = "netutils"
 version = "0.1.0"
-source = "git+https://gitlab.redox-os.org/redox-os/netutils.git?branch=redox-unix#55c55eb6452ee886dfd81f1cbb7f9ec45012d95e"
+source = "git+https://gitlab.redox-os.org/redox-os/netutils.git?branch=redox-unix#a55df137538fabadea2eff74153ac0b8d3ce3dcf"
 dependencies = [
  "arg_parser",
  "extra",
@@ -1108,8 +1108,7 @@ dependencies = [
 [[package]]
 name = "redox_syscall"
 version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+source = "git+https://gitlab.redox-os.org/4lDO2/syscall.git?branch=userspace_fexec#d6af266119e7b4a3b0e9a04c63b3cfcfac94781a"
 dependencies = [
  "bitflags",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 8078a99e90..48733bd4e9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,3 +25,4 @@ members = [
 mio = { git = "https://gitlab.redox-os.org/redox-os/mio.git", branch = "redox-unix" }
 net2 = { git = "https://gitlab.redox-os.org/redox-os/net2-rs.git", branch = "master" }
 orbclient = { git = "https://gitlab.redox-os.org/redox-os/orbclient.git", version = "0.3.28" }
+redox_syscall = { git = "https://gitlab.redox-os.org/4lDO2/syscall.git", branch = "userspace_fexec" }
diff --git a/ahcid/Cargo.toml b/ahcid/Cargo.toml
index 74f11ce48a..81bfc57ff6 100644
--- a/ahcid/Cargo.toml
+++ b/ahcid/Cargo.toml
@@ -9,5 +9,5 @@ byteorder = "1.2"
 log = "0.4"
 partitionlib = { git = "https://gitlab.redox-os.org/redox-os/partitionlib.git" }
 redox-log = "0.1"
-redox_syscall = "0.2.12"
+redox_syscall = { git = "https://gitlab.redox-os.org/4lDO2/syscall.git", branch = "userspace_fexec" }
 block-io-wrapper = { path = "../block-io-wrapper" }
diff --git a/ahcid/src/main.rs b/ahcid/src/main.rs
index cef16638a2..9a4c75e73b 100644
--- a/ahcid/src/main.rs
+++ b/ahcid/src/main.rs
@@ -88,7 +88,7 @@ fn main() {
     info!(" + AHCI {} on: {:X} size: {} IRQ: {}", name, bar, bar_size, irq);
 
     let address = unsafe {
-        syscall::physmap(bar, bar_size, PHYSMAP_WRITE | PHYSMAP_NO_CACHE)
+        syscall::physmap(bar, (bar_size+4095)/4096*4096, PHYSMAP_WRITE | PHYSMAP_NO_CACHE)
             .expect("ahcid: failed to map address")
     };
     {