diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5449cca3..97ee16aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 * Tidy up some declarations
 * Fix basic_streambuf::capacity
 * Add basic_streambuf::alloc_size
+* Parser callbacks may not throw
 
 --------------------------------------------------------------------------------
 
diff --git a/include/beast/http/basic_parser_v1.hpp b/include/beast/http/basic_parser_v1.hpp
index 24e79fc8..0df50283 100644
--- a/include/beast/http/basic_parser_v1.hpp
+++ b/include/beast/http/basic_parser_v1.hpp
@@ -141,8 +141,9 @@ static std::uint64_t constexpr no_content_length =
     "callbacks" from here on) matching a specific signature.
 
     Callbacks are detected through SFINAE. The derived class may
-    implement as few or as many of the members as needed.
-    These are the signatures of the callbacks:<br>
+    implement as few or as many of the members as needed. Callbacks
+    may not throw exceptions. These are the signatures of the
+    callbacks:<br>
 
     @li `void on_start(error_code&)`