diff --git a/changelog.md b/changelog.md
index 01b142554f..9703a31662 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,4 +1,10 @@
 HEAD
+- BREAKING API CHANGE: All WebSocket++ methods now throw an exception of type 
+  `websocketpp::exception` which derives from `std::exception`. This normalizes
+  all exception types under the standard exception hierarchy and allows
+  WebSocket++ exceptions to be caught in the same statement as others. The error
+  code that was previously thrown is wrapped in the exception object and can be
+  accessed via the `websocketpp::exception::code()` method.
 - Feature: Adds `start_perpetual` and `stop_perpetual` methods to asio transport
   These may be used to replace manually managed `asio::io_service::work` objects
 - Feature: Allow setting pong and handshake timeouts at runtime.