diff --git a/.cargo/config.toml b/.cargo/config.toml
index 10eb1be..df37036 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,5 +1,6 @@
 [unstable]
 build-std = ["core", "compiler_builtins", "alloc"]
+build-std-features = ["compiler-builtins-mem"]
 
 [build]
 target = "x86_64-moros.json"
diff --git a/Cargo.lock b/Cargo.lock
index fe4e0c1..3c5414a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -231,7 +231,6 @@ dependencies = [
  "pc-keyboard",
  "pic8259_simple",
  "raw-cpuid",
- "rlibc",
  "sha2",
  "smoltcp",
  "spin 0.7.0",
@@ -308,12 +307,6 @@ dependencies = [
  "rustc_version",
 ]
 
-[[package]]
-name = "rlibc"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc874b127765f014d792f16763a81245ab80500e2ad921ed4ee9e82481ee08fe"
-
 [[package]]
 name = "rsdp"
 version = "1.0.0"
diff --git a/Cargo.toml b/Cargo.toml
index b5bd1ee..d318c60 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,7 +32,6 @@ pbkdf2 = { version = "0.3.0", default-features = false }
 pc-keyboard = "0.5.1"
 pic8259_simple = "0.2.0"
 raw-cpuid = "8.1.0"
-rlibc = "1.0.0"
 sha2 = { version = "0.8.2", default-features = false }
 smoltcp = { version = "0.6.0", default-features = false, features = ["alloc", "ethernet", "socket-tcp", "socket-udp", "proto-ipv4", "proto-dhcpv4"] }
 spin = "0.7.0"
diff --git a/src/main.rs b/src/main.rs
index 2005948..01a3c47 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,7 +1,6 @@
 #![no_std]
 #![no_main]
 
-extern crate rlibc; // TODO: See https://github.com/rust-lang/wg-cargo-std-aware/issues/53
 extern crate alloc;
 
 use bootloader::{entry_point, BootInfo};