diff --git a/mozilla/content/base/src/nsHTMLContentSerializer.cpp b/mozilla/content/base/src/nsHTMLContentSerializer.cpp
index 2fa248b8327..73e9b0f47e0 100644
--- a/mozilla/content/base/src/nsHTMLContentSerializer.cpp
+++ b/mozilla/content/base/src/nsHTMLContentSerializer.cpp
@@ -638,6 +638,9 @@ nsHTMLContentSerializer::LineBreakAfterOpen(nsIAtom* aName,
       (aName == nsHTMLAtoms::meta) ||
       (aName == nsHTMLAtoms::link) ||
       (aName == nsHTMLAtoms::script) ||
+      (aName == nsHTMLAtoms::img) ||
+      (aName == nsHTMLAtoms::map) ||
+      (aName == nsHTMLAtoms::area) ||
       (aName == nsHTMLAtoms::style)) {
     return PR_TRUE;
   }
@@ -690,6 +693,7 @@ nsHTMLContentSerializer::LineBreakAfterClose(nsIAtom* aName,
       (aName == nsHTMLAtoms::dd) ||
       (aName == nsHTMLAtoms::blockquote) ||
       (aName == nsHTMLAtoms::p) ||
+      (aName == nsHTMLAtoms::map) ||
       (aName == nsHTMLAtoms::div)) {
     return PR_TRUE;
   }
diff --git a/mozilla/content/html/content/src/nsHTMLAtomList.h b/mozilla/content/html/content/src/nsHTMLAtomList.h
index a12292a6284..0130c4207e2 100644
--- a/mozilla/content/html/content/src/nsHTMLAtomList.h
+++ b/mozilla/content/html/content/src/nsHTMLAtomList.h
@@ -189,6 +189,7 @@ HTML_ATOM(legendContentPseudo, ":legend-content")
 HTML_ATOM(length, "length")
 HTML_ATOM(longdesc, "longdesc")
 HTML_ATOM(lowsrc, "lowsrc")
+HTML_ATOM(map, "map")
 HTML_ATOM(marginheight, "marginheight")
 HTML_ATOM(marginwidth, "marginwidth")
 HTML_ATOM(maxlength, "maxlength")
diff --git a/mozilla/content/shared/public/nsHTMLAtomList.h b/mozilla/content/shared/public/nsHTMLAtomList.h
index a12292a6284..0130c4207e2 100644
--- a/mozilla/content/shared/public/nsHTMLAtomList.h
+++ b/mozilla/content/shared/public/nsHTMLAtomList.h
@@ -189,6 +189,7 @@ HTML_ATOM(legendContentPseudo, ":legend-content")
 HTML_ATOM(length, "length")
 HTML_ATOM(longdesc, "longdesc")
 HTML_ATOM(lowsrc, "lowsrc")
+HTML_ATOM(map, "map")
 HTML_ATOM(marginheight, "marginheight")
 HTML_ATOM(marginwidth, "marginwidth")
 HTML_ATOM(maxlength, "maxlength")