diff --git a/.cargo/config b/.cargo/config
index 4efa883590998861a5e5421f6633c99ee7eccb71..42399c1716a867e56f3e536771e75ccaea043e1b 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -1,6 +1,6 @@
 [unstable]
 build-std = ["core", "alloc"]
-build-std-features = ["compiler-builtins-mem", "compiler-builtins-asm"]
+build-std-features = ["compiler-builtins-mem"]
 
 [build]
 target = "x86_64-unknown-hermit-kernel"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c2821208a339f3fbb5c9385df3eba1f2588efef2..6296b8e1e64717f0d725a3a37db2073fd2e49ed0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ set(HERMIT_RS "${CMAKE_BINARY_DIR}/hermit_rs/${HERMIT_ARCH}-unknown-hermit-kerne
 add_custom_target(hermit_rs
 	COMMAND
 		${CMAKE_COMMAND} -E env CARGO_TARGET_DIR=${CMAKE_BINARY_DIR}/hermit_rs RUST_TARGET_PATH=${HERMIT_ROOT}/librs
-		cargo build ${CARGO_BUILDTYPE_PARAMETER} -Z build-std=core,alloc -Zbuild-std-features=compiler-builtins-asm,compiler-builtins-mem --target ${HERMIT_ARCH}-unknown-hermit-kernel.json --features newlib
+		cargo build ${CARGO_BUILDTYPE_PARAMETER} -Z build-std=core,alloc -Zbuild-std-features=compiler-builtins-mem --target ${HERMIT_ARCH}-unknown-hermit-kernel.json --features newlib
 	WORKING_DIRECTORY
 		${CMAKE_CURRENT_LIST_DIR})
 
diff --git a/rust-toolchain b/rust-toolchain
index bbbefdfc537d67e84c2ca3411663ba8d8c3be563..df325b3c3d8472152b41be20aa6c3f871b9631b7 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1,4 +1,3 @@
 [toolchain]
-channel = "nightly-2020-12-23"
+channel = "nightly-2021-01-22"
 components = [ "rustfmt", "rust-src", "llvm-tools-preview"]
-targets = [ "x86_64-unknown-hermit" ]