diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index f9af8c116..977f35172 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -2,6 +2,7 @@
  - Fixed a fatal error with Redirects
  - Fixed a fatal error in the date field in the new pluggable forms system.
  - Fixed a nasty logout bug.
+ - Fixed a formatting problem with the forum rich editor.
  - Fixed a fatal error in www_viewStatistics (mwilson)
  - Fixed some errors in FileCache.pm (mwilson)
  - Disabled killing of own session since it sometimes displays weird things
diff --git a/docs/upgrades/upgrade_6.7.0-6.7.1.pl b/docs/upgrades/upgrade_6.7.0-6.7.1.pl
index 61654e566..6518e0190 100644
--- a/docs/upgrades/upgrade_6.7.0-6.7.1.pl
+++ b/docs/upgrades/upgrade_6.7.0-6.7.1.pl
@@ -23,7 +23,18 @@ WebGUI::Session::open("../..",$configFile);
 WebGUI::Session::refreshUserInfo(3);
 
 WebGUI::SQL->write("insert into webguiVersion values (".quote($toVersion).",'upgrade',".time().")");
-
+fixForumRichEdit();
 
 
 WebGUI::Session::close();
+
+
+#-------------------------------------------------
+sub fixForumRichEdit {
+        print "\tFixing the forum rich editor properties.\n" unless ($quiet);
+	my $validElements = 'a[name|href|target|title],strong/b[class],em/i[class],strike[class],u[class],p[dir|class|align],ol,ul,li,br,img[class|src|border=0|alt|title|hspace|vspace|width|height|align],sub,sup,blockquote[dir|style],table[border=0|cellspacing|cellpadding|width|height|class|align],tr[class|rowspan|width|height|align|valign],td[dir|class|colspan|rowspan|width|height|align|valign],div[dir|class|align],span[class|align],pre[class|align],address[class|align],h1[dir|class|align],h2[dir|class|align],h3[dir|class|align],h4[dir|class|align],h5[dir|class|align],h6[dir|class|align],hr';
+	WebGUI::SQL->write("update RichEdit set validElements=".quote($prepend)." where assetId='PBrichedit000000000002'");
+	WebGUI::SQL->write("update assetData set endDate=".(time()+60*60*24*365*20)." where assetId='PBrichedit000000000002'");
+}
+
+