diff --git a/doc/build/changelog.rst b/doc/build/changelog.rst
index 67755fe..851b137 100644
--- a/doc/build/changelog.rst
+++ b/doc/build/changelog.rst
@@ -10,6 +10,15 @@
     :released:
 
     .. change::
+        :tags: bug, py2k
+        :pullreq: bitbucket:8
+
+      Improved the error re-raise operation when a custom
+      :paramref:`.Template.error_handler` is used that does not handle
+      the exception; the original stack trace etc. is now preserved.
+      Pull request courtesy Manfred Haltner.
+
+    .. change::
         :tags: bug, py2k, filters
         :pullreq: bitbucket:7