diff --git a/CHANGELOG.md b/CHANGELOG.md
index edd7805b..19b46acd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 Version 179:
 
 * Use the exchange() idiom in move constructors
+* Most members of std::allocate are deprecated in C++17
 
 --------------------------------------------------------------------------------
 
diff --git a/include/boost/beast/experimental/core/impl/flat_stream.ipp b/include/boost/beast/experimental/core/impl/flat_stream.ipp
index 6447c43a..a94622f7 100644
--- a/include/boost/beast/experimental/core/impl/flat_stream.ipp
+++ b/include/boost/beast/experimental/core/impl/flat_stream.ipp
@@ -28,8 +28,13 @@ class flat_stream<NextLayer>::write_op
     : public boost::asio::coroutine
 {
     using alloc_type = typename 
+#if defined(BOOST_NO_CXX11_ALLOCATOR)
         boost::asio::associated_allocator_t<Handler>::template
             rebind<char>::other;
+#else
+        std::allocator_traits<boost::asio::associated_allocator_t<Handler>>
+            ::template rebind_alloc<char>;
+#endif
 
     struct deleter
     {
diff --git a/include/boost/beast/experimental/http/impl/icy_stream.ipp b/include/boost/beast/experimental/http/impl/icy_stream.ipp
index 7ada8e41..c9fa3a84 100644
--- a/include/boost/beast/experimental/http/impl/icy_stream.ipp
+++ b/include/boost/beast/experimental/http/impl/icy_stream.ipp
@@ -197,8 +197,13 @@ class icy_stream<NextLayer>::read_op
     : public boost::asio::coroutine
 {
     using alloc_type = typename 
+#if defined(BOOST_NO_CXX11_ALLOCATOR)
         boost::asio::associated_allocator_t<Handler>::template
             rebind<char>::other;
+#else
+        std::allocator_traits<boost::asio::associated_allocator_t<Handler>>
+            ::template rebind_alloc<char>;
+#endif
 
     struct data
     {