Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html	(revision 5665)
+++ /CKEditor/trunk/CHANGES.html	(revision 5666)
@@ -57,4 +57,5 @@
 		<li><a href="http://dev.fckeditor.net/ticket/5687">#5687</a> : Navigation through colors is now compatible with RTL.</li>
 		<li><a href="http://dev.fckeditor.net/ticket/4615">#4615</a> : [IE] Text fields are no longer disrupted in dialog with RTL.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/5887">#5887</a> : The number of columns in the smilies table is now configurable via the smiley_columns setting.</li>
 	</ul>
 	<h3>
Index: /CKEditor/trunk/_source/plugins/smiley/dialogs/smiley.js
===================================================================
--- /CKEditor/trunk/_source/plugins/smiley/dialogs/smiley.js	(revision 5665)
+++ /CKEditor/trunk/_source/plugins/smiley/dialogs/smiley.js	(revision 5666)
@@ -9,5 +9,5 @@
 		lang = editor.lang.smiley,
 		images = config.smiley_images,
-		columns = 8,
+		columns = config.smiley_columns || 8,
 		i;
 
Index: /CKEditor/trunk/_source/plugins/smiley/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/smiley/plugin.js	(revision 5665)
+++ /CKEditor/trunk/_source/plugins/smiley/plugin.js	(revision 5666)
@@ -83,2 +83,12 @@
 		'yes', 'heart', 'broken heart', 'kiss', 'mail'
 	];
+
+/**
+ * The number of columns to be generated by the smilies matrix.
+ * @name CKEDITOR.config.smiley_columns
+ * @type Number
+ * @default 8
+ * @since 3.3.2
+ * @example
+ * config.smiley_columns = 6;
+ */