Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html	(revision 7408)
+++ /CKEditor/trunk/CHANGES.html	(revision 7409)
@@ -75,4 +75,5 @@
 		<li><a href="http://dev.ckeditor.com/ticket/8732">#8732</a> : Fixed issue when CKEDITOR.range::enlarge passes through comment nodes.</li>
 		<li><a href="http://dev.ckeditor.com/ticket/7492">#7492</a> : Enable in the Style system to use overrides with the same element (change classes instead of nesting).</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6111">#6111</a> : Splitting cells results in incorrect column spans.</li>
 	</ul>
 	<h3>
Index: /CKEditor/trunk/_source/plugins/tabletools/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/tabletools/plugin.js	(revision 7408)
+++ /CKEditor/trunk/_source/plugins/tabletools/plugin.js	(revision 7409)
@@ -491,5 +491,5 @@
 	}
 
-	function cellInCol( tableMap, colIndex, cell )
+	function cellInCol( tableMap, colIndex )
 	{
 		var oCol = [];
@@ -497,13 +497,11 @@
 		{
 			var row = tableMap[ r ];
-			if ( typeof cell == 'undefined' )
-				oCol.push( row[ colIndex ] );
-			else if ( cell.is && row[ colIndex ] == cell.$ )
-				return r;
-			else if ( r == cell )
-				return new CKEDITOR.dom.element( row[ colIndex ] );
-		}
-
-		return ( typeof cell == 'undefined' )? oCol : cell.is ? -1 :  null;
+			oCol.push( row[ colIndex ] );
+
+			// Avoid adding duplicate cells.
+			if ( row[ colIndex ].rowSpan > 1 )
+				r += row[ colIndex ].rowSpan - 1;
+		}
+		return oCol;
 	}