diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d08cec7..4900e816 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,17 @@
 1.0.0-b29
 
-* Fix race in writes during WebSocket reads
 * Fix compilation error in non-template class
+* Document type-pun in buffer_cat
 
 HTTP
 
 * Fix Body requirements doc
 * Fix illegal HTTP characters accepted as hex zero
 
+WebSocket
+
+* Fix race in writes during reads
+
 --------------------------------------------------------------------------------
 
 1.0.0-b28
diff --git a/include/beast/core/detail/buffer_cat.hpp b/include/beast/core/detail/buffer_cat.hpp
index b5dcd4aa..60d840c2 100644
--- a/include/beast/core/detail/buffer_cat.hpp
+++ b/include/beast/core/detail/buffer_cat.hpp
@@ -82,6 +82,7 @@ class buffer_cat_helper<Bn...>::const_iterator
     iter_t<I>&
     iter()
     {
+        // type-pun
         return *reinterpret_cast<
             iter_t<I>*>(static_cast<void*>(
                 buf_.data()));
@@ -91,6 +92,7 @@ class buffer_cat_helper<Bn...>::const_iterator
     iter_t<I> const&
     iter() const
     {
+        // type-pun
         return *reinterpret_cast<
             iter_t<I> const*>(static_cast<
                 void const*>(buf_.data()));