diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index ffee4e8ae..0ed5ec2da 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -12,6 +12,7 @@
  - fixed #9635: Matrix - Add attributes not working
  - fixed: Many child assets, including WikiPage, Post and Event, will no longer let you add or paste them in places where they do not belong.
  - fixed: Hardcoded extras url in templates and in extra head tags in assets were replaced with the Extras macro.
+ - fixed: Fixed bad gateway macros in the Matrix templates.
 
 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/matrix-default-compare-template.wgpkg b/docs/upgrades/packages-7.6.11/matrix-default-compare-template.wgpkg
index 758f874d9..28ac7a27f 100644
Binary files a/docs/upgrades/packages-7.6.11/matrix-default-compare-template.wgpkg and b/docs/upgrades/packages-7.6.11/matrix-default-compare-template.wgpkg differ
diff --git a/docs/upgrades/packages-7.6.11/matrix-default-detailed-listing.wgpkg b/docs/upgrades/packages-7.6.11/matrix-default-detailed-listing.wgpkg
index 5fc67a999..7bbc5bdbf 100644
Binary files a/docs/upgrades/packages-7.6.11/matrix-default-detailed-listing.wgpkg and b/docs/upgrades/packages-7.6.11/matrix-default-detailed-listing.wgpkg differ
diff --git a/docs/upgrades/packages-7.6.11/matrix-default-view-template.wgpkg b/docs/upgrades/packages-7.6.11/matrix-default-view-template.wgpkg
new file mode 100644
index 000000000..0826c5a42
Binary files /dev/null and b/docs/upgrades/packages-7.6.11/matrix-default-view-template.wgpkg differ
diff --git a/docs/upgrades/packages-7.6.11/matrix-search-template.wgpkg b/docs/upgrades/packages-7.6.11/matrix-search-template.wgpkg
index 09fc9e786..dc61044f2 100644
Binary files a/docs/upgrades/packages-7.6.11/matrix-search-template.wgpkg and b/docs/upgrades/packages-7.6.11/matrix-search-template.wgpkg differ