diff --git a/.gitmodules b/.gitmodules
index 80f8f8ca5..972d88ffd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -9,7 +9,7 @@
 [submodule "rust"]
 	path = rust
 	url = https://gitlab.redox-os.org/redox-os/rust.git
-	branch = redox-2022-03-18
+	branch = redox-2023-01-21
 [submodule "redoxfs"]
 	path = redoxfs
 	url = https://gitlab.redox-os.org/redox-os/redoxfs.git
diff --git a/mk/prefix.mk b/mk/prefix.mk
index 0264d2f92..a96ecdf25 100644
--- a/mk/prefix.mk
+++ b/mk/prefix.mk
@@ -151,6 +151,7 @@ else
 	"$</configure" \
 		--prefix="/" \
 		--disable-docs \
+		--disable-download-ci-llvm \
 		--enable-cargo-native-static \
 		--enable-extended \
 		--enable-lld \
@@ -240,6 +241,7 @@ else
 	"$</configure" \
 		--prefix="/" \
 		--disable-docs \
+		--disable-download-ci-llvm \
 		--enable-cargo-native-static \
 		--enable-dist-src \
 		--enable-extended \
diff --git a/relibc b/relibc
index a37916101..0bd476d28 160000
--- a/relibc
+++ b/relibc
@@ -1 +1 @@
-Subproject commit a37916101fbe8061704c1fc5079021b20789e318
+Subproject commit 0bd476d28af204c34c62cb3e7b5e4c660838d59b
diff --git a/rust b/rust
index d30df15f6..08f61d402 160000
--- a/rust
+++ b/rust
@@ -1 +1 @@
-Subproject commit d30df15f622c711ab9b27f487e6bde67075a6e44
+Subproject commit 08f61d4025be0ecba7e66bb136434f72c8af3fe9
diff --git a/rust-toolchain b/rust-toolchain
deleted file mode 100644
index 9eed51006..000000000
--- a/rust-toolchain
+++ /dev/null
@@ -1 +0,0 @@
-nightly-2022-03-18
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
new file mode 100644
index 000000000..87f6fe713
--- /dev/null
+++ b/rust-toolchain.toml
@@ -0,0 +1,3 @@
+[toolchain]
+channel = "nightly-2023-01-21"
+components = ["rust-src"]