diff --git a/Cargo.toml b/Cargo.toml
index 186a875..beddedc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,7 @@ license = "MIT"
 homepage = "https://github.com/snapview/tokio-tungstenite"
 documentation = "https://docs.rs/tokio-tungstenite/0.6.0"
 repository = "https://github.com/snapview/tokio-tungstenite"
-version = "0.6.0"
+version = "0.7.0"
 
 [features]
 default = ["connect", "tls"]
@@ -21,7 +21,10 @@ futures = "0.1.23"
 tokio-io = "0.1.7"
 
 [dependencies.tungstenite]
-version = "0.6.0"
+# Uncomment when `tungstenite-rs` is released.
+# version = "0.7.0"
+git = "https://github.com/snapview/tungstenite-rs"
+branch = "close-as-message"
 default-features = false
 
 [dependencies.bytes]
diff --git a/src/lib.rs b/src/lib.rs
index 7cfe2c0..a55d696 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -161,6 +161,7 @@ where
 /// and unit tests for this crate.
 pub struct WebSocketStream<S> {
     inner: WebSocket<S>,
+    stream_ended: bool,
 }
 
 impl<S> WebSocketStream<S> {
@@ -171,8 +172,7 @@ impl<S> WebSocketStream<S> {
         role: Role,
         config: Option<WebSocketConfig>,
     ) -> Self {
-        let ws = WebSocket::from_raw_socket(stream, role, config);
-        WebSocketStream { inner: ws }
+        Self::new(WebSocket::from_raw_socket(stream, role, config))
     }
 
     /// Convert a raw socket into a WebSocketStream without performing a
@@ -183,8 +183,14 @@ impl<S> WebSocketStream<S> {
         role: Role,
         config: Option<WebSocketConfig>,
     ) -> Self {
-        let ws = WebSocket::from_partially_read(stream, part, role, config);
-        WebSocketStream { inner: ws }
+        Self::new(WebSocket::from_partially_read(stream, part, role, config))
+    }
+
+    fn new(ws: WebSocket<S>) -> Self {
+        WebSocketStream {
+            inner: ws,
+            stream_ended: false,
+        }
     }
 }
 
@@ -193,7 +199,17 @@ impl<T> Stream for WebSocketStream<T> where T: AsyncRead + AsyncWrite {
     type Error = WsError;
 
     fn poll(&mut self) -> Poll<Option<Message>, WsError> {
-        self.inner.read_message().map(|m| Some(m)).to_async()
+        if self.stream_ended {
+            self.stream_ended = false;
+            return Ok(Async::Ready(None))
+        }
+
+        self.inner.read_message().map(|m| {
+            if m.is_close() {
+                self.stream_ended = true;
+            }
+            Some(m)
+        }).to_async()
     }
 }
 
@@ -227,7 +243,7 @@ impl<S: AsyncRead + AsyncWrite> Future for ConnectAsync<S> {
     fn poll(&mut self) -> Poll<Self::Item, WsError> {
         match self.inner.poll()? {
             Async::NotReady => Ok(Async::NotReady),
-            Async::Ready((ws, resp)) => Ok(Async::Ready((WebSocketStream { inner: ws }, resp))),
+            Async::Ready((ws, resp)) => Ok(Async::Ready((WebSocketStream::new(ws), resp))),
         }
     }
 }
@@ -245,7 +261,7 @@ impl<S: AsyncRead + AsyncWrite, C: Callback> Future for AcceptAsync<S, C> {
     fn poll(&mut self) -> Poll<Self::Item, WsError> {
         match self.inner.poll()? {
             Async::NotReady => Ok(Async::NotReady),
-            Async::Ready(ws) => Ok(Async::Ready(WebSocketStream { inner: ws })),
+            Async::Ready(ws) => Ok(Async::Ready(WebSocketStream::new(ws))),
         }
     }
 }