diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 16ae28fbb..bbec8ee3a 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -3,6 +3,7 @@
       Article,Post,Event,File,Form::Attachments,Folder
  - added the optional WebGUI::Content::PDFGenerator, not enabled by default
    (see the module's documentation).
+ - fixed #12204: Default forum notification template produces invalid HTML
 
 7.10.20
  - fixed: Do not call group methods on an undefined value.
diff --git a/docs/upgrades/packages-7.10.21/default_forum_notification.wgpkg b/docs/upgrades/packages-7.10.21/default_forum_notification.wgpkg
new file mode 100644
index 000000000..4c7c7afd8
Binary files /dev/null and b/docs/upgrades/packages-7.10.21/default_forum_notification.wgpkg differ