diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index c8f9bc9cd..0441d10be 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -32,6 +32,8 @@
  - Increased the performance of CS Thread viewing by 500%.
  - Changed the CS post rating mechinism to thumbs up/down to be less
    confusing.
+ - Updated TinyMCE rich text editor to version 2.0.5.1.
+ - Disabled the rich editor for Safari because it doesn't work correctly.
  - Added install/uninstall functions to the asset and wobject skeletons to
    make custom assets easier to distribute.
  - Added a mechanism for importing and exporting packages. This is useful for
diff --git a/lib/WebGUI/Asset/RichEdit.pm b/lib/WebGUI/Asset/RichEdit.pm
index 58a4f84cf..5eae8face 100644
--- a/lib/WebGUI/Asset/RichEdit.pm
+++ b/lib/WebGUI/Asset/RichEdit.pm
@@ -424,7 +424,7 @@ sub getToolbar {
 #-------------------------------------------------------------------
 sub getRichEditor {
 	my $self = shift;
-	return '' if $self->getValue('disableRichEditor');
+	return '' if ($self->getValue('disableRichEditor') || $self->session->env->get("HTTP_USER_AGENT") =~ /Safari/);
 	my $nameId = shift;
 	my @toolbarRow1 = split("\n",$self->getValue("toolbarRow1"));	
 	push(@toolbarRow1,"contextmenu") if ($self->getValue("enableContextMenu"));