diff --git a/.cargo/config b/.cargo/config
index e2c90b5f284fc249e7dc01781add52280544b564..69c4db47dcee085641f5b1284dfca89dd42e264a 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -1,18 +1,3 @@
-paths = [
-    "patches/jobserver-rs",
-    "patches/mio",
-    "patches/nix",
-    "patches/tokio/tokio",
-    "patches/tokio/tokio-reactor",
-    "patches/net2-rs",
-    "patches/pb",
-    "patches/platform-info",
-    "patches/ring",
-    "patches/tar-rs",
-    "patches/termsize",
-    "patches/time",
-]
-
 [target.aarch64-unknown-redox]
 linker = "aarch64-unknown-redox-gcc"
 rustflags = []
diff --git a/.gitmodules b/.gitmodules
index cc1ec1f570726bcaf95b0d0ab629c8df00635e64..849ef0779e5246dee74073803dc130e2330c9945 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,66 +1,12 @@
 [submodule "docgen"]
 	path = docgen
 	url = https://gitlab.redox-os.org/redox-os/docgen.git
-[submodule "pkgutils"]
-	path = pkgutils
-	url = https://gitlab.redox-os.org/redox-os/pkgutils.git
 	branch = master
-[submodule "patches/atty"]
-	path = patches/atty
-	url = https://gitlab.redox-os.org/redox-os/atty.git
-	branch = redox-unix
-[submodule "patches/pb"]
-	path = patches/pb
-	url = https://gitlab.redox-os.org/redox-os/pb.git
-	branch = redox-unix
-[submodule "patches/net2-rs"]
-	path = patches/net2-rs
-	url = https://gitlab.redox-os.org/redox-os/net2-rs.git
-	branch = redox-unix
-[submodule "patches/ring"]
-	path = patches/ring
-	url = https://gitlab.redox-os.org/redox-os/ring.git
-	branch = redox-unix-0.13.5
-[submodule "patches/time"]
-	path = patches/time
-	url = https://gitlab.redox-os.org/redox-os/time.git
-	branch = redox-unix
-[submodule "patches/termsize"]
-	path = patches/termsize
-	url = https://gitlab.redox-os.org/redox-os/termsize.git
-	branch = redox-unix
-[submodule "patches/platform-info"]
-	path = patches/platform-info
-	url = https://gitlab.redox-os.org/redox-os/platform-info.git
-	branch = redox-unix
-[submodule "patches/tar-rs"]
-	path = patches/tar-rs
-	url = https://gitlab.redox-os.org/redox-os/tar-rs.git
-	branch = redox-unix
-[submodule "patches/liblibc"]
-	path = patches/liblibc
-	url = https://gitlab.redox-os.org/redox-os/liblibc.git
-	branch = redox-unix
-[submodule "patches/mio"]
-	path = patches/mio
-	url = https://gitlab.redox-os.org/redox-os/mio.git
-	branch = redox-unix
-[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
-[submodule "patches/jobserver-rs"]
-	path = patches/jobserver-rs
-	url = https://gitlab.redox-os.org/redox-os/jobserver-rs.git
-	branch = redox
 [submodule "pkgar"]
 	path = pkgar
 	url = https://gitlab.redox-os.org/redox-os/pkgar.git
 	branch = master
+[submodule "pkgutils"]
+	path = pkgutils
+	url = https://gitlab.redox-os.org/redox-os/pkgutils.git
+	branch = master
diff --git a/patches/jobserver-rs b/patches/jobserver-rs
deleted file mode 160000
index 54508e47f2349cbd0cef9fcf6e6f0cd4bd12d91d..0000000000000000000000000000000000000000
--- a/patches/jobserver-rs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 54508e47f2349cbd0cef9fcf6e6f0cd4bd12d91d
diff --git a/patches/mio b/patches/mio
deleted file mode 160000
index c9a70849ced97387e2607c9c466d23b130ec8901..0000000000000000000000000000000000000000
--- a/patches/mio
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c9a70849ced97387e2607c9c466d23b130ec8901
diff --git a/patches/net2-rs b/patches/net2-rs
deleted file mode 160000
index be7b855982e63770753a81ffc4bedf66d7f66506..0000000000000000000000000000000000000000
--- a/patches/net2-rs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit be7b855982e63770753a81ffc4bedf66d7f66506
diff --git a/patches/nix b/patches/nix
deleted file mode 160000
index 64b3ea0fb108b9933766fd7e049e2c320636b972..0000000000000000000000000000000000000000
--- a/patches/nix
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 64b3ea0fb108b9933766fd7e049e2c320636b972
diff --git a/patches/pb b/patches/pb
deleted file mode 160000
index 743300cf9566f77962a5b550db1ba27cc922b6a5..0000000000000000000000000000000000000000
--- a/patches/pb
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 743300cf9566f77962a5b550db1ba27cc922b6a5
diff --git a/patches/platform-info b/patches/platform-info
deleted file mode 160000
index ff3e9789a7478d614a9e26d7016fe893ffea7713..0000000000000000000000000000000000000000
--- a/patches/platform-info
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ff3e9789a7478d614a9e26d7016fe893ffea7713
diff --git a/patches/ring b/patches/ring
deleted file mode 160000
index e10e9b891589b1d4bf5a5e83e999000734f04d68..0000000000000000000000000000000000000000
--- a/patches/ring
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e10e9b891589b1d4bf5a5e83e999000734f04d68
diff --git a/patches/tar-rs b/patches/tar-rs
deleted file mode 160000
index 5e19d818c3e67fe6215b8c244ec86d445ab4d515..0000000000000000000000000000000000000000
--- a/patches/tar-rs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5e19d818c3e67fe6215b8c244ec86d445ab4d515
diff --git a/patches/termsize b/patches/termsize
deleted file mode 160000
index a63940dc8608bb1a8c27a06302bd8674fd25f874..0000000000000000000000000000000000000000
--- a/patches/termsize
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a63940dc8608bb1a8c27a06302bd8674fd25f874
diff --git a/patches/time b/patches/time
deleted file mode 160000
index 0c24c8c1483e17b4c7974c68dbb29d609d9c699b..0000000000000000000000000000000000000000
--- a/patches/time
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0c24c8c1483e17b4c7974c68dbb29d609d9c699b
diff --git a/patches/tokio b/patches/tokio
deleted file mode 160000
index 75f296e4b48f5d2966f2bd1cc6b04111a58bd4fd..0000000000000000000000000000000000000000
--- a/patches/tokio
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 75f296e4b48f5d2966f2bd1cc6b04111a58bd4fd