diff --git a/.gitmodules b/.gitmodules
index 4596ae17d02..9be0dffa21f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -32,3 +32,7 @@
 [submodule "library/backtrace"]
 	path = library/backtrace
 	url = https://github.com/rust-lang/backtrace-rs.git
+
+[submodule "yggdrasil-rt"]
+	path = yggdrasil-rt
+    url = git@git.alnyan.me:yggdrasil/yggdrasil-rt.git
diff --git a/Cargo.lock b/Cargo.lock
index 1e15958692a..12a42955102 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,15 +2,6 @@
 # It is not intended for manual editing.
 version = 3
 
-[[package]]
-name = "abi"
-version = "0.1.0"
-dependencies = [
- "compiler_builtins",
- "rustc-std-workspace-alloc",
- "rustc-std-workspace-core",
-]
-
 [[package]]
 name = "addr2line"
 version = "0.17.0"
@@ -7169,15 +7160,26 @@ dependencies = [
 ]
 
 [[package]]
-name = "yggdrasil-rt"
+name = "yggdrasil-abi"
 version = "0.1.0"
+source = "git+https://git.alnyan.me/yggdrasil/yggdrasil-abi.git#7ed747351a3e72ffb6602eef48cda8403b3b1db9"
 dependencies = [
- "abi",
  "compiler_builtins",
  "rustc-std-workspace-alloc",
  "rustc-std-workspace-core",
 ]
 
+[[package]]
+name = "yggdrasil-rt"
+version = "0.1.0"
+source = "git+https://git.alnyan.me/yggdrasil/yggdrasil-rt.git#adfc37dde413ca413bf9b2bded45dd32456ce9ab"
+dependencies = [
+ "compiler_builtins",
+ "rustc-std-workspace-alloc",
+ "rustc-std-workspace-core",
+ "yggdrasil-abi",
+]
+
 [[package]]
 name = "yoke"
 version = "0.7.0"
diff --git a/Cargo.toml b/Cargo.toml
index 1fcaaf6ddc4..f720637cc29 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -118,3 +118,6 @@ rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' }
 
 [patch."https://github.com/rust-lang/rust-clippy"]
 clippy_lints = { path = "src/tools/clippy/clippy_lints" }
+
+[patch."https://git.alnyan.me/yggdrasil/yggdrasil-rt.git"]
+yggdrasil-rt = { path = "yggdrasil-rt" }
diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml
index 785d65b8e63..ceef55240b4 100644
--- a/library/std/Cargo.toml
+++ b/library/std/Cargo.toml
@@ -46,7 +46,7 @@ fortanix-sgx-abi = { version = "0.5.0", features = ['rustc-dep-of-std'] }
 hermit-abi = { version = "0.3.0", features = ['rustc-dep-of-std'] }
 
 [target.'cfg(target_os = "yggdrasil")'.dependencies]
-yggdrasil-rt = { path = "/home/alnyan/build/sandbox/yggdrasil-rt", features = ['rustc-dep-of-std'] }
+yggdrasil-rt = { git = "https://git.alnyan.me/yggdrasil/yggdrasil-rt.git", features = ['rustc-dep-of-std'] }
 
 [target.wasm32-wasi.dependencies]
 wasi = { version = "0.11.0", features = ['rustc-dep-of-std'], default-features = false }
diff --git a/yggdrasil-rt b/yggdrasil-rt
new file mode 160000
index 00000000000..adfc37dde41
--- /dev/null
+++ b/yggdrasil-rt
@@ -0,0 +1 @@
+Subproject commit adfc37dde413ca413bf9b2bded45dd32456ce9ab