diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 8bcc9fb31..d9f2a1910 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -13,6 +13,7 @@
    may have caused problems in some people's databases. If it has all you
    need to do to fix it is upgrade to this release and then run
    sbin/rebuildLineage.pl
+ - fix [ 1356544 ] FAQ template in collaboration has wrong anchors
 
 6.8.0
  - Switched Date::Manip to DateTime for better performance and more 
diff --git a/docs/upgrades/upgrade_6.8.0-6.8.1.pl b/docs/upgrades/upgrade_6.8.0-6.8.1.pl
index c890a7252..321fbf451 100644
--- a/docs/upgrades/upgrade_6.8.0-6.8.1.pl
+++ b/docs/upgrades/upgrade_6.8.0-6.8.1.pl
@@ -14,6 +14,7 @@ use Getopt::Long;
 use WebGUI::Session;
 use File::Path;
 use WebGUI::SQL;
+use WebGUI::Asset;
 
 my $toVersion = "6.8.1"; # make this match what version you're going to
 my $quiet; # this line required
@@ -22,6 +23,7 @@ my $quiet; # this line required
 start(); # this line required
 
 upgradeRichEditor();
+fixCSFaqTemplateAnchors();
 
 finish(); # this line required
 
@@ -32,6 +34,16 @@ sub upgradeRichEditor {
 	rmtree("../../www/extras/tinymce");
 }
 
+#-------------------------------------------------
+sub fixCSFaqTemplateAnchors {
+	print "\tFix Anchors in the CS FAQ Template\n" unless ($quiet);
+	my $asset = WebGUI::Asset->new("PBtmpl0000000000000080","WebGUI::Asset::Template");
+	if (defined $asset) {  ##Can't update what doesn't exist
+		my $template = $asset->get("template");
+		$template =~ s/(<a href="#)(<tmpl_var assetId>)/${1}id${2}/;
+		$asset->addRevision({template=>$template})->commit;
+	}
+}
 
 
 # ---- DO NOT EDIT BELOW THIS LINE ----