Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html	(revision 6265)
+++ /CKEditor/trunk/CHANGES.html	(revision 6266)
@@ -53,4 +53,5 @@
 		<li><a href="http://dev.ckeditor.com/ticket/6566">#6566</a> : It is now possible to exit blockquote with enterMode BR.</li>
 		<li><a href="http://dev.ckeditor.com/ticket/6868">#6868</a> : Partial (invalid) list structure crashes editor load.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6804">#6804</a> : Buggy behavior when editing &lt;legend&gt; inside &lt;fieldset&gt;.</li>
 	</ul>
 	<h3>
Index: /CKEditor/trunk/_source/core/dom/elementpath.js
===================================================================
--- /CKEditor/trunk/_source/core/dom/elementpath.js	(revision 6265)
+++ /CKEditor/trunk/_source/core/dom/elementpath.js	(revision 6266)
@@ -7,8 +7,8 @@
 {
 	// Elements that may be considered the "Block boundary" in an element path.
-	var pathBlockElements = { address:1,blockquote:1,dl:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1,li:1,dt:1,dd:1 };
+	var pathBlockElements = { address:1,blockquote:1,dl:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1,li:1,dt:1,dd:1, legend:1 };
 
 	// Elements that may be considered the "Block limit" in an element path.
-	var pathBlockLimitElements = { body:1,div:1,table:1,tbody:1,tr:1,td:1,th:1,caption:1,form:1 };
+	var pathBlockLimitElements = { body:1,div:1,table:1,tbody:1,tr:1,td:1,th:1,caption:1,form:1,fieldset:1 };
 
 	// Check if an element contains any block element.