Index: /CKEditor/branches/features/bbcode/_source/plugins/bbcode/plugin.js
===================================================================
--- /CKEditor/branches/features/bbcode/_source/plugins/bbcode/plugin.js	(revision 6734)
+++ /CKEditor/branches/features/bbcode/_source/plugins/bbcode/plugin.js	(revision 6735)
@@ -657,5 +657,5 @@
 	CKEDITOR.plugins.add( 'bbcode',
 	  {
-		  requires : [ 'htmldataprocessor' ],
+		  requires : [ 'htmldataprocessor', 'entities' ],
 		  beforeInit : function( editor )
 		  {
@@ -666,4 +666,5 @@
 			  {
 				  enterMode : CKEDITOR.ENTER_BR,
+				  basicEntities: false,
 				  entities : false,
 				  fillEmptyBlocks : false
Index: /CKEditor/branches/features/bbcode/_source/plugins/entities/plugin.js
===================================================================
--- /CKEditor/branches/features/bbcode/_source/plugins/entities/plugin.js	(revision 6734)
+++ /CKEditor/branches/features/bbcode/_source/plugins/entities/plugin.js	(revision 6735)
@@ -7,5 +7,5 @@
 {
 	// Base HTML entities.
-	var htmlbase = 'nbsp,gt,lt';
+	var htmlbase = 'nbsp,gt,lt,amp';
 
 	var entities =
@@ -62,5 +62,6 @@
 				shy		: '\u00AD',		// IE
 				gt		: '\u003E',		// IE | FF |   --   | Opera
-				lt		: '\u003C'		// IE | FF | Safari | Opera
+				lt		: '\u003C',		// IE | FF | Safari | Opera
+				amp : '\u0026'		// ALL
 			};
 
@@ -114,5 +115,8 @@
 			{
 				// Mandatory HTML base entities.
-				var selectedEntities = htmlbase;
+				var selectedEntities = '';
+
+				if ( config.basicEntities !== false )
+					selectedEntities += htmlbase;
 
 				if ( config.entities )
@@ -171,4 +175,20 @@
 
 /**
+ * Whether to escape HTML preserved entities in text, including:
+ * <ul>
+ * <li>nbsp</li>
+ * <li>gt</li>
+ * <li>lt</li>
+ * <li>amp</li>
+ * </ul>
+ * <strong>Note:</strong> It should not be subjected to change unless you're outputting non-HTML data format like BBCode.
+ * @type Boolean
+ * @default true
+ * @example
+ * config.basicEntities = false;
+ */
+CKEDITOR.config.basicEntities = true;
+
+/**
  * Whether to use HTML entities in the output.
  * @type Boolean