diff --git a/Cargo.toml b/Cargo.toml
index bf93da0..ca3ba8b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,7 @@ description = "An RPC framework for Rust with a focus on ease of use."
 bincode = "0.6"
 byteorder = "0.5"
 bytes = { git = "https://github.com/carllerche/bytes" }
-futures = { git = "https://github.com/alexcrichton/futures-rs" }
+futures = "0.1"
 lazy_static = "0.2"
 log = "0.3"
 scoped-pool = "1.0"
@@ -24,12 +24,12 @@ tarpc-plugins = { path = "src/plugins" }
 take = "0.1"
 tokio-service = { git = "https://github.com/tokio-rs/tokio-service" }
 tokio-proto = { git = "https://github.com/tokio-rs/tokio-proto" }
-tokio-core = { git = "https://github.com/tokio-rs/tokio-core" }
+tokio-core = "0.1"
 
 [dev-dependencies]
 chrono = "0.2"
 env_logger = "0.3"
-futures-cpupool = { git = "https://github.com/alexcrichton/futures-rs" }
+futures-cpupool = "0.1"
 
 [features]
 unstable = ["serde/unstable"]
diff --git a/src/protocol/reader.rs b/src/protocol/reader.rs
index 1b78939..e6c3808 100644
--- a/src/protocol/reader.rs
+++ b/src/protocol/reader.rs
@@ -53,7 +53,7 @@ trait MutBufExt: MutBuf + Sized {
     fn take(&mut self) -> Self::Inner;
 
     fn try_read<R: TryRead>(&mut self, stream: &mut R) -> io::Result<NextReadAction<Self::Inner>> {
-        while let Some(bytes_read) = stream.try_read_buf(self)? {
+        while let Async::Ready(bytes_read) = stream.try_read_buf(self)? {
             debug!("Reader: read {} bytes, {} remaining.",
                    bytes_read,
                    self.remaining());
diff --git a/src/protocol/writer.rs b/src/protocol/writer.rs
index 3935654..44e67a9 100644
--- a/src/protocol/writer.rs
+++ b/src/protocol/writer.rs
@@ -49,7 +49,7 @@ trait BufExt: Buf + Sized {
     /// Writes data to stream. Returns Ok(true) if all data has been written or Ok(false) if
     /// there's still data to write.
     fn try_write<W: TryWrite>(&mut self, stream: &mut W) -> io::Result<NextWriteAction> {
-        while let Some(bytes_written) = stream.try_write_buf(self)? {
+        while let Async::Ready(bytes_written) = stream.try_write_buf(self)? {
             debug!("Writer: wrote {} bytes; {} remaining.",
                    bytes_written,
                    self.remaining());