diff --git a/doc/qbk/03_core/4__layers.qbk b/doc/qbk/03_core/4__layers.qbk
index a00245a7..cac1cf5a 100644
--- a/doc/qbk/03_core/4__layers.qbk
+++ b/doc/qbk/03_core/4__layers.qbk
@@ -72,13 +72,6 @@ facilities for authoring and working with layered streams:
     customization point, allowing sockets to be closed in generic
     contexts in an extensible fashion.
 ]]
-[[
-    [link beast.ref.boost__beast__flat_stream `flat_stream`]
-][
-    A flat stream operates as a transparent stream which helps to work around
-    a limitation of `net::ssl::stream`. It is used in the implementation
-    of [link beast.ref.boost__beast__ssl_stream `ssl_stream`].
-]]
 [[
     [link beast.ref.boost__beast__get_lowest_layer `get_lowest_layer`]
 ][
@@ -105,13 +98,6 @@ facilities for authoring and working with layered streams:
     of reference returned by
     [link beast.ref.boost__beast__get_lowest_layer `get_lowest_layer`]
 ]]
-[[
-    [link beast.ref.boost__beast__ssl_stream `ssl_stream`]
-][
-    The SSL stream is a drop-in replacement for `net::ssl::stream` which
-    allows for move-construction and move-assignment, and also implements
-    a work-around for a performance limitation in the original SSL stream.
-]]
 ]
 
 [/-----------------------------------------------------------------------------]
diff --git a/doc/qbk/08_design/4_faq.qbk b/doc/qbk/08_design/4_faq.qbk
index 75490169..9b0808a2 100644
--- a/doc/qbk/08_design/4_faq.qbk
+++ b/doc/qbk/08_design/4_faq.qbk
@@ -267,9 +267,7 @@ about Beast and other HTTP libraries that have gone through formal review.
     (for example, a `boost::asio::ip::tcp::socket` or a
     `boost::asio::ssl::stream`). You establish your TLS connection using the
     interface on `ssl::stream` like shown in all of the Asio examples, then
-    construct your `websocket::stream` around it. It works perfectly fine;
-    Beast comes with an `ssl_stream` wrapper in the example directory which
-    allows the SSL stream to be moved, overcoming an Asio limitation.
+    construct your `websocket::stream` around it.
 
     The WebSocket implementation [*does] provide support for shutting down
     the TLS connection through the use of the ADL compile-time virtual functions
diff --git a/doc/qbk/quickref.xml b/doc/qbk/quickref.xml
index 807cbb50..cf50e689 100644
--- a/doc/qbk/quickref.xml
+++ b/doc/qbk/quickref.xml
@@ -30,7 +30,7 @@
           <member><link linkend="beast.ref.boost__beast__file_posix">file_posix</link></member>
           <member><link linkend="beast.ref.boost__beast__file_stdio">file_stdio</link></member>
           <member><link linkend="beast.ref.boost__beast__file_win32">file_win32</link></member>
-          <member><link linkend="beast.ref.boost__beast__flat_stream">flat_stream</link></member>
+          <member><link linkend="beast.ref.boost__beast__flat_stream">flat_stream</link> (deprecated)</member>
           <member><link linkend="beast.ref.boost__beast__iequal">iequal</link></member>
           <member><link linkend="beast.ref.boost__beast__iless">iless</link></member>
           <member><link linkend="beast.ref.boost__beast__rate_policy_access">rate_policy_access</link></member>
@@ -87,7 +87,7 @@
         </simplelist>
         <bridgehead renderas="sect3">SSL</bridgehead>
         <simplelist type="vert" columns="1">
-          <member><link linkend="beast.ref.boost__beast__ssl_stream">ssl_stream</link></member>
+          <member><link linkend="beast.ref.boost__beast__ssl_stream">ssl_stream</link> (deprecated)</member>
         </simplelist>
       </entry>
       <entry valign="top">
diff --git a/include/boost/beast/core/flat_stream.hpp b/include/boost/beast/core/flat_stream.hpp
index 42844ba5..d1df1afe 100644
--- a/include/boost/beast/core/flat_stream.hpp
+++ b/include/boost/beast/core/flat_stream.hpp
@@ -22,7 +22,9 @@
 namespace boost {
 namespace beast {
 
-/** Stream wrapper to improve write performance.
+/** (Deprecated: This wrapper is no longer needed; Asio linearizes
+    scatter/gather I/O in ssl::stream.) Stream wrapper to improve write
+    performance.
 
     This wrapper flattens writes for buffer sequences having length
     greater than 1 and total size below a predefined amount, using
diff --git a/include/boost/beast/ssl/ssl_stream.hpp b/include/boost/beast/ssl/ssl_stream.hpp
index 546e8f9c..87885a23 100644
--- a/include/boost/beast/ssl/ssl_stream.hpp
+++ b/include/boost/beast/ssl/ssl_stream.hpp
@@ -24,7 +24,7 @@
 namespace boost {
 namespace beast {
 
-/** Provides stream-oriented functionality using OpenSSL
+/** (Deprecated: Use asio::ssl::stream instead.) Provides stream-oriented functionality using OpenSSL
 */
 template<class NextLayer>
 struct ssl_stream : net::ssl::stream<NextLayer>