Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html	(revision 6930)
+++ /CKEditor/trunk/CHANGES.html	(revision 6931)
@@ -57,4 +57,5 @@
 		<li><a href="http://dev.ckeditor.com/ticket/7733">#7733</a> : Flash movies inserted with the flash dialog window were not displaying properly when injected to the page.</li>
 		<li><a href="http://dev.ckeditor.com/ticket/7844">#7844</a> : [IE&lt;8] Inserting a page break resulted in an error.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7804">#7804</a> : The HTML5 <a href="http://www.w3.org/TR/html-markup/wbr.html"><code>wbr</code></a> tag is now recognized by the editor</li>
 		<li>Updated the following language files:<ul>
 			<li><a href="http://dev.ckeditor.com/ticket/7834">#7834</a> : Dutch;</li>
Index: /CKEditor/trunk/_source/core/dtd.js
===================================================================
--- /CKEditor/trunk/_source/core/dtd.js	(revision 6930)
+++ /CKEditor/trunk/_source/core/dtd.js	(revision 6931)
@@ -40,5 +40,5 @@
 		E = {hr:1,ul:1,menu:1,div:1,blockquote:1,noscript:1,table:1,center:1,address:1,dir:1,pre:1,h5:1,dl:1,h4:1,noframes:1,h6:1,ol:1,h1:1,h3:1,h2:1},
 		F = {ins:1,del:1,script:1,style:1},
-		G = X({b:1,acronym:1,bdo:1,'var':1,'#':1,abbr:1,code:1,br:1,i:1,cite:1,kbd:1,u:1,strike:1,s:1,tt:1,strong:1,q:1,samp:1,em:1,dfn:1,span:1},F),
+		G = X({b:1,acronym:1,bdo:1,'var':1,'#':1,abbr:1,code:1,br:1,i:1,cite:1,kbd:1,u:1,strike:1,s:1,tt:1,strong:1,q:1,samp:1,em:1,dfn:1,span:1,wbr:1},F),
 		H = X({sub:1,img:1,object:1,sup:1,basefont:1,map:1,applet:1,font:1,big:1,small:1},G),
 		I = X({p:1},H),
@@ -98,5 +98,5 @@
 		 * @example
 		 */
-		$empty : {area:1,base:1,br:1,col:1,hr:1,img:1,input:1,link:1,meta:1,param:1},
+		$empty : {area:1,base:1,br:1,col:1,hr:1,img:1,input:1,link:1,meta:1,param:1,wbr:1},
 
 		/**
@@ -108,9 +108,9 @@
 
 		/**
-	     * List of list root elements.
-	     * @type Object
-	     * @example
-	     */
-	    $list: { ul:1,ol:1,dl:1},
+		 * List of list root elements.
+		 * @type Object
+		 * @example
+		 */
+		$list: {ul:1,ol:1,dl:1},
 
 		/**
@@ -159,4 +159,5 @@
         td : P,
         br : {},
+        wbr : {},
         th : P,
         center : P,