diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 667ea2e95204c3b693762577344a655214671675..84b7f34aa53c072cea154f7fef46f3c8e34d5fe5 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,6 +6,7 @@ Wysiwyg x.x-x.x, xxxx-xx-xx
 
 Wysiwyg 6.x-2.x, xxxx-xx-xx
 ---------------------------
+#398848 by sun: Added support for TinyMCE 3.1.
 #394068 by StephaneC: markItUp: Fixed icons not displayed due to #385736.
 #385974 by sun: Fixed form element description for CSS path (for Define CSS).
 #390460 by sun: Fixed broken plugin loading due to #359626.
diff --git a/editors/tinymce.inc b/editors/tinymce.inc
index edd749ee829b2333b50c074d9601c7084265d030..ab356f9f07fd90578f87c958196783d7fcc3e8a4 100644
--- a/editors/tinymce.inc
+++ b/editors/tinymce.inc
@@ -47,7 +47,7 @@ function wysiwyg_tinymce_editor() {
         'css files' => array('tinymce-2.css'),
         'download url' => 'http://sourceforge.net/project/showfiles.php?group_id=103281&package_id=111430&release_id=557383',
       ),
-      '3.2' => array(
+      '3.1' => array(
         // 'include files' => array('tinymce-3.inc'),
         'js files' => array('tinymce-3.js'),
         'css files' => array('tinymce-3.css'),