diff --git a/CHANGELOG.md b/CHANGELOG.md
index 091a4775..d6afda55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+* Fix MSVC build error.
+
+--------------------------------------------------------------------------------
+
 Version 310:
 
 * Update Release Notes.
diff --git a/include/boost/beast/core/impl/multi_buffer.hpp b/include/boost/beast/core/impl/multi_buffer.hpp
index 8565b09f..bd4087cd 100644
--- a/include/boost/beast/core/impl/multi_buffer.hpp
+++ b/include/boost/beast/core/impl/multi_buffer.hpp
@@ -916,7 +916,7 @@ prepare(size_type n) ->
             std::size_t altn = in_size_ * growth_factor;
 	    // Overflow detection:
             if(in_size_ > altn)
-                altn = std::numeric_limits<std::size_t>::max();
+                altn = (std::numeric_limits<std::size_t>::max)();
             else
                 altn = (std::max<std::size_t>)(512, altn);
             auto const size =