diff --git a/.cargo/config b/.cargo/config
index 6e57e7c0..9952f0e4 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -2,6 +2,8 @@ paths = [
     "patches/atty",
     "patches/liblibc",
     "patches/mio",
+    "patches/tokio/tokio",
+    "patches/tokio/tokio-reactor",
     "patches/net2-rs",
     "patches/pb",
     "patches/platform-info",
diff --git a/.gitmodules b/.gitmodules
index bccd9a18..84266852 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -49,3 +49,6 @@
 	path = patches/mio
 	url = https://gitlab.redox-os.org/redox-os/mio.git
 	branch = redox-unix
+[submodule "patches/tokio"]
+	path = patches/tokio
+	url = git@gitlab.redox-os.org:redox-os/tokio.git
diff --git a/patches/mio b/patches/mio
index 58b70e49..c9a70849 160000
--- a/patches/mio
+++ b/patches/mio
@@ -1 +1 @@
-Subproject commit 58b70e4906d927139c499bb4bb29a990b35588fc
+Subproject commit c9a70849ced97387e2607c9c466d23b130ec8901
diff --git a/patches/tokio b/patches/tokio
new file mode 160000
index 00000000..880522af
--- /dev/null
+++ b/patches/tokio
@@ -0,0 +1 @@
+Subproject commit 880522af62a59db82fafdc7bd7c8c58ec3302428