diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 194fbcc50d904e9fe1ec0613f3ebd23a6fa8c584..52b5b219fb55d223014d9451e1d4a9ad5dc19f57 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -5,6 +5,7 @@ $Id$
 * #536776 SECURITY: file manager should refuse to work with fckeditor library older than 2.6.4.1
 * #488090 Custom upload path not working when using private folders
 * #541126 Support CVS versions of img_assist
+* #410398 Smiley not in DrupalFull toolbar
 
 -- 2009-08-05 version 6.x-2.x-dev
 * #293976 Add parameters to clear static variables in functions
diff --git a/fckeditor.config.js b/fckeditor.config.js
index 94b5b633d7068f8931d6e3df640fe203965075b2..4655f8dc3fa3962ff600ac7c8ff6ca40ad495ed9 100644
--- a/fckeditor.config.js
+++ b/fckeditor.config.js
@@ -41,7 +41,7 @@ FCKConfig.ToolbarSets['DrupalFull'] = [
  */
 //['Link','Unlink','LinkToNode','LinkToMenu','Anchor'],
 ['Link','Unlink','Anchor'],
-['Image','Flash','Table','Rule','SpecialChar','DrupalBreak'],
+['Image','Flash','Table','Rule','Smiley','SpecialChar','DrupalBreak'],
 //uncomment this line to enable the page break button
 //remember to load appropriate plugin with FCKConfig.Plugins.Add
 //['Image','Flash','Table','Rule','SpecialChar','DrupalBreak','DrupalPageBreak'],