diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index b12a3d6e2..6f95f0007 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,4 +1,5 @@
 7.6.0
+ - fixed: Some templates ship with isPublic=1
  - fixed: DataForm export tab delimited doesn't work
  - fixed: Project Manager sometimes causes errors when adding users to a task
  - fixed: site navigation will sometimes show as half or not styled
diff --git a/docs/upgrades/upgrade_7.5.21-7.6.0.pl b/docs/upgrades/upgrade_7.5.21-7.6.0.pl
index 1d9542c16..f2ee62552 100644
--- a/docs/upgrades/upgrade_7.5.21-7.6.0.pl
+++ b/docs/upgrades/upgrade_7.5.21-7.6.0.pl
@@ -29,10 +29,17 @@ my $quiet; # this line required
 my $session = start(); # this line required
 
 removeDoNothingOnDelete( $session );
+fixIsPublicOnTemplates ( $session );
 
 finish($session); # this line required
 
 
+#----------------------------------------------------------------------------
+sub fixIsPublicOnTemplates {
+    my $session = shift;
+    $session->db->write('UPDATE `assetIndex` SET `isPublic` = 0 WHERE assetId IN (SELECT assetId FROM asset WHERE className IN ("WebGUI::Asset::RichEdit", "WebGUI::Asset::Snippet", "WebGUI::Asset::Template") )');
+}
+
 #----------------------------------------------------------------------------
 sub removeDoNothingOnDelete {
     my $session = shift;