Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html	(revision 6272)
+++ /CKEditor/trunk/CHANGES.html	(revision 6273)
@@ -59,4 +59,5 @@
 		<li><a href="http://dev.ckeditor.com/ticket/6661">#6661</a> : [IE] Pre-formatted style doesn't preserve applied text direction.</li>
 		<li><a href="http://dev.ckeditor.com/ticket/6655">#6655</a> : Resize grip has a small visual offsets.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6604">#6604</a> : &lt;div&gt; should be used as formatting block in enterBr.</li>
 	</ul>
 	<h3>
Index: /CKEditor/trunk/_source/plugins/indent/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/indent/plugin.js	(revision 6272)
+++ /CKEditor/trunk/_source/plugins/indent/plugin.js	(revision 6273)
@@ -216,5 +216,5 @@
 				iterator.enlargeBr = enterMode != CKEDITOR.ENTER_BR;
 				var block;
-				while ( ( block = iterator.getNextParagraph() ) )
+				while ( ( block = iterator.getNextParagraph( enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' ) ) )
 					indentElement( block );
 			}
Index: /CKEditor/trunk/_source/plugins/justify/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/justify/plugin.js	(revision 6272)
+++ /CKEditor/trunk/_source/plugins/justify/plugin.js	(revision 6273)
@@ -160,5 +160,5 @@
 				iterator.enlargeBr = enterMode != CKEDITOR.ENTER_BR;
 
-				while ( ( block = iterator.getNextParagraph() ) )
+				while ( ( block = iterator.getNextParagraph( enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' ) ) )
 				{
 					block.removeAttribute( 'align' );