diff --git a/docs/changes.txt b/docs/changes.txt
index 1fb06ed883..a6e35f23d5 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -96,6 +96,7 @@ wxMSW:
 wxHTML:
 
 - improved tables layout algorithm (Tim Kosse)
+- <div> handling fix (Xavier Nodet)
 
 
 2.5.1
diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index aa9ea66ee1..2464a5a9ce 100644
--- a/src/html/m_layout.cpp
+++ b/src/html/m_layout.cpp
@@ -260,11 +260,20 @@ TAG_HANDLER_BEGIN(DIV, "DIV")
             else
                 c->SetAlignHor(old);
 
-            return TRUE;
+            return true;
         }
         else
         {
-            return FALSE;
+            // Same as BR
+            int al = m_WParser->GetContainer()->GetAlignHor();
+            wxHtmlContainerCell *c;
+
+            m_WParser->CloseContainer();
+            c = m_WParser->OpenContainer();
+            c->SetAlignHor(al);
+            c->SetAlign(tag);
+            c->SetMinHeight(m_WParser->GetCharHeight());
+            return false;
         }
     }