diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 071291115..0fd591e0b 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -24,6 +24,7 @@
  - fixed #9675: gallary search list displays wrong date for pictures
  - fixed: Added survey.css as a snippet.  Had been left out.
  - fixed: Permissions aren't correctly applied to Article attachments
+ - fixed #9681: Form-related template errors in gallery
 
 7.6.10
  - fixed #9577: WebGUI::Form::Url::getValue returns blank rather than undef for blank fields
diff --git a/docs/upgrades/packages-7.6.11/root_import_gallery-templates_default-gallery-edit-album.wgpkg b/docs/upgrades/packages-7.6.11/root_import_gallery-templates_default-gallery-edit-album.wgpkg
new file mode 100644
index 000000000..9de20b857
Binary files /dev/null and b/docs/upgrades/packages-7.6.11/root_import_gallery-templates_default-gallery-edit-album.wgpkg differ
diff --git a/docs/upgrades/packages-7.6.11/root_import_gallery-templates_default-gallery-edit-comment.wgpkg b/docs/upgrades/packages-7.6.11/root_import_gallery-templates_default-gallery-edit-comment.wgpkg
new file mode 100644
index 000000000..15f20c7de
Binary files /dev/null and b/docs/upgrades/packages-7.6.11/root_import_gallery-templates_default-gallery-edit-comment.wgpkg differ
diff --git a/docs/upgrades/packages-7.6.11/root_import_gallery-templates_default-gallery-edit-photo.wgpkg b/docs/upgrades/packages-7.6.11/root_import_gallery-templates_default-gallery-edit-photo.wgpkg
new file mode 100644
index 000000000..d79a8bb29
Binary files /dev/null and b/docs/upgrades/packages-7.6.11/root_import_gallery-templates_default-gallery-edit-photo.wgpkg differ
diff --git a/docs/upgrades/packages-7.6.11/root_import_gallery-templates_default-gallery-make-shortcut.wgpkg b/docs/upgrades/packages-7.6.11/root_import_gallery-templates_default-gallery-make-shortcut.wgpkg
new file mode 100644
index 000000000..9418117c0
Binary files /dev/null and b/docs/upgrades/packages-7.6.11/root_import_gallery-templates_default-gallery-make-shortcut.wgpkg differ