diff --git a/.cargo/config b/.cargo/config
index fcad4b69c72501c7fd825d174c0fb3c65ac81b1a..c6052f61b4dd654ff202f86701816987beb8409e 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -1,7 +1,8 @@
 paths = [
     "patches/atty",
-    "patches/liblibc",
+    "patches/libc",
     "patches/mio",
+    "patches/nix",
     "patches/tokio/tokio",
     "patches/tokio/tokio-reactor",
     "patches/net2-rs",
diff --git a/.gitmodules b/.gitmodules
index 486723ae8e03235e0c10bd632a6693e46422826f..0835e1f17e82b816094e21848fe3ee0dd3ae0ea4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -48,3 +48,11 @@
 [submodule "patches/tokio"]
 	path = patches/tokio
 	url = https://gitlab.redox-os.org/redox-os/tokio.git
+[submodule "patches/libc"]
+	path = patches/libc
+	url = https://github.com/AdminXVII/libc
+	branch = extra-traits-redox
+[submodule "patches/nix"]
+	path = patches/nix
+	url = https://github.com/AdminXVII/nix
+	branch = add-redox-support
diff --git a/patches/libc b/patches/libc
new file mode 160000
index 0000000000000000000000000000000000000000..f6c0ead0279077dd9bda305e6c9d3ba3267390b2
--- /dev/null
+++ b/patches/libc
@@ -0,0 +1 @@
+Subproject commit f6c0ead0279077dd9bda305e6c9d3ba3267390b2
diff --git a/patches/liblibc b/patches/liblibc
deleted file mode 160000
index eb75c489172e10bfcb57ca679ff337827cf783a9..0000000000000000000000000000000000000000
--- a/patches/liblibc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit eb75c489172e10bfcb57ca679ff337827cf783a9
diff --git a/patches/nix b/patches/nix
new file mode 160000
index 0000000000000000000000000000000000000000..6fd64569452536e9759c45c8f4511e6c983196f3
--- /dev/null
+++ b/patches/nix
@@ -0,0 +1 @@
+Subproject commit 6fd64569452536e9759c45c8f4511e6c983196f3