diff --git a/bootstrap/Cargo.toml b/bootstrap/Cargo.toml
index 2cdc5def3..ef6c7cc8d 100644
--- a/bootstrap/Cargo.toml
+++ b/bootstrap/Cargo.toml
@@ -5,10 +5,6 @@ version = "0.1.0"
 license = "Apache-2.0 OR MIT"
 edition = "2018"
 
-[package.metadata.cargo-xbuild]
-memcpy = true
-sysroot_path = "target/sysroot"
-
 [dependencies]
 sunrise-libutils = { path = "../libutils" }
 bit_field = "0.10.0"
diff --git a/docs/BUILDING.md b/docs/BUILDING.md
index 1b2941737..d47205cbc 100644
--- a/docs/BUILDING.md
+++ b/docs/BUILDING.md
@@ -8,7 +8,7 @@ If you don't want to (or can't) use `rustup`, you should check the `rust-toolcha
 
 ## Build orchestration
 
-`cargo-make` is used to orchestrate the build. It can be installed through `cargo install cargo-make`. Check out the [versions section](#versions) to find out what the minimum version of cargo-xbuild is necessary to build SunriseOS.
+`cargo-make` is used to orchestrate the build. It can be installed through `cargo install cargo-make`. Check out the [versions section](#versions) to find out what the minimum version of xrago is necessary to build SunriseOS.
 
 `cargo-make` will install all the other tools necessary to properly build SunriseOS. Note that `cargo-make` won't attempt to update already installed tools. If the build fails, check out the [versions section](#versions) and ensure all the tools are installed and have the appropriate version.
 
@@ -26,7 +26,7 @@ First, ensure you have qemu installed, as `cargo-make` will not automatically in
   - clippy
   - rust-src
 - cargo-make: `0.20.0`
-- cargo-xbuild: `0.5.14`
+- xargo: `0.3.14`
 - mkisofs-rs: `0.1.0`
 - qemu-system-i386: `4.0.50`
 - cargo-travis: `https://github.com/roblabla/cargo-travis` branch `doc-upload-target`
\ No newline at end of file
diff --git a/docs/UPDATE_RUST.md b/docs/UPDATE_RUST.md
index 09876fb6c..5c02e892a 100644
--- a/docs/UPDATE_RUST.md
+++ b/docs/UPDATE_RUST.md
@@ -15,7 +15,7 @@ We will occasionally want to update the version of the Rust Compiler we use in o
     - rust-std
     - rustc
 2. Set the `rust-toolchain` file at the root of the repo to `nightly-$LATEST_VER`. For instance, if the latest version to support all the requirements is 2019-07-15, then set the rust-toolchain file to `nightly-2019-07-15`.
-3. Update `cargo-xbuild` to the latest version. It likely contains fixes for latest rust changes (there are breaking changes to `no_std` builds from time to time).
+3. Update `xargo` to the latest version. It likely contains fixes for latest rust changes (there are breaking changes to `no_std` builds from time to time).
 4. Compile the whole project, and fix all the errors.
 5. Update the `BUILDING.md` with the new minimum versions.
 
diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml
index bc345e759..3590bd0ee 100644
--- a/kernel/Cargo.toml
+++ b/kernel/Cargo.toml
@@ -5,11 +5,6 @@ version = "0.1.0"
 license = "Apache-2.0 OR MIT"
 edition = "2018"
 
-[package.metadata.cargo-xbuild]
-memcpy = true
-sysroot_path = "target/sysroot"
-
-
 [features]
 #Will make the kernel panic if an exception is encountered. Useful for debugging.
 panic-on-exception = []