diff --git a/src/arch/x86_64.rs b/src/arch/x86_64.rs
index 52ad01b..76c3da1 100644
--- a/src/arch/x86_64.rs
+++ b/src/arch/x86_64.rs
@@ -1,20 +1,20 @@
 use super::error::{Error, Result};
 
 pub unsafe fn syscall0(mut a: usize) -> Result<usize> {
-    asm!("int 0x80"
+    asm!("syscall"
         : "={rax}"(a)
         : "{rax}"(a)
-        : "memory"
+        : "rcx", "r11", "memory"
         : "intel", "volatile");
 
     Error::demux(a)
 }
 
 pub unsafe fn syscall1(mut a: usize, b: usize) -> Result<usize> {
-    asm!("int 0x80"
+    asm!("syscall"
         : "={rax}"(a)
-        : "{rax}"(a), "{rbx}"(b)
-        : "memory"
+        : "{rax}"(a), "{rdi}"(b)
+        : "rcx", "r11", "memory"
         : "intel", "volatile");
 
     Error::demux(a)
@@ -22,9 +22,9 @@ pub unsafe fn syscall1(mut a: usize, b: usize) -> Result<usize> {
 
 // Clobbers all registers - special for clone
 pub unsafe fn syscall1_clobber(mut a: usize, b: usize) -> Result<usize> {
-    asm!("int 0x80"
+    asm!("syscall"
         : "={rax}"(a)
-        : "{rax}"(a), "{rbx}"(b)
+        : "{rax}"(a), "{rdi}"(b)
         : "memory", "rbx", "rcx", "rdx", "rsi", "rdi", "r8",
           "r9", "r10", "r11", "r12", "r13", "r14", "r15"
         : "intel", "volatile");
@@ -33,30 +33,30 @@ pub unsafe fn syscall1_clobber(mut a: usize, b: usize) -> Result<usize> {
 }
 
 pub unsafe fn syscall2(mut a: usize, b: usize, c: usize) -> Result<usize> {
-    asm!("int 0x80"
+    asm!("syscall"
         : "={rax}"(a)
-        : "{rax}"(a), "{rbx}"(b), "{rcx}"(c)
-        : "memory"
+        : "{rax}"(a), "{rdi}"(b), "{rsi}"(c)
+        : "rcx", "r11", "memory"
         : "intel", "volatile");
 
     Error::demux(a)
 }
 
 pub unsafe fn syscall3(mut a: usize, b: usize, c: usize, d: usize) -> Result<usize> {
-    asm!("int 0x80"
+    asm!("syscall"
         : "={rax}"(a)
-        : "{rax}"(a), "{rbx}"(b), "{rcx}"(c), "{rdx}"(d)
-        : "memory"
+        : "{rax}"(a), "{rdi}"(b), "{rsi}"(c), "{rdx}"(d)
+        : "rcx", "r11", "memory"
         : "intel", "volatile");
 
     Error::demux(a)
 }
 
 pub unsafe fn syscall4(mut a: usize, b: usize, c: usize, d: usize, e: usize) -> Result<usize> {
-    asm!("int 0x80"
+    asm!("syscall"
         : "={rax}"(a)
-        : "{rax}"(a), "{rbx}"(b), "{rcx}"(c), "{rdx}"(d), "{rsi}"(e)
-        : "memory"
+        : "{rax}"(a), "{rdi}"(b), "{rsi}"(c), "{rdx}"(d), "{r10}"(e)
+        : "rcx", "r11", "memory"
         : "intel", "volatile");
 
     Error::demux(a)
@@ -64,10 +64,10 @@ pub unsafe fn syscall4(mut a: usize, b: usize, c: usize, d: usize, e: usize) ->
 
 pub unsafe fn syscall5(mut a: usize, b: usize, c: usize, d: usize, e: usize, f: usize)
                        -> Result<usize> {
-    asm!("int 0x80"
+    asm!("syscall"
         : "={rax}"(a)
-        : "{rax}"(a), "{rbx}"(b), "{rcx}"(c), "{rdx}"(d), "{rsi}"(e), "{rdi}"(f)
-        : "memory"
+        : "{rax}"(a), "{rdi}"(b), "{rsi}"(c), "{rdx}"(d), "{r10}"(e), "{r8}"(f)
+        : "rcx", "r11", "memory"
         : "intel", "volatile");
 
     Error::demux(a)