diff --git a/mozilla/content/html/document/src/nsHTMLContentSink.cpp b/mozilla/content/html/document/src/nsHTMLContentSink.cpp
index 8114e193426..78a9ab59c82 100644
--- a/mozilla/content/html/document/src/nsHTMLContentSink.cpp
+++ b/mozilla/content/html/document/src/nsHTMLContentSink.cpp
@@ -1014,6 +1014,7 @@ MakeContentObject(nsHTMLTag aNodeType,
     rv = NS_NewHTMLDelElement(aResult, aNodeInfo);
     break;
   case eHTMLTag_div:
+  case eHTMLTag_marquee:
   case eHTMLTag_noembed:
   case eHTMLTag_noframes:
   case eHTMLTag_noscript:
diff --git a/mozilla/htmlparser/public/nsHTMLTagList.h b/mozilla/htmlparser/public/nsHTMLTagList.h
index ff833da7e43..75f2e381552 100644
--- a/mozilla/htmlparser/public/nsHTMLTagList.h
+++ b/mozilla/htmlparser/public/nsHTMLTagList.h
@@ -124,6 +124,7 @@ HTML_TAG(li)
 HTML_TAG(link)
 HTML_TAG(listing)
 HTML_TAG(map)
+HTML_TAG(marquee)
 HTML_TAG(menu)
 HTML_TAG(meta)
 HTML_TAG(multicol)
diff --git a/mozilla/htmlparser/src/nsElementTable.cpp b/mozilla/htmlparser/src/nsElementTable.cpp
index d6523b2bf87..076b1824cc6 100644
--- a/mozilla/htmlparser/src/nsElementTable.cpp
+++ b/mozilla/htmlparser/src/nsElementTable.cpp
@@ -820,6 +820,15 @@ void InitializeElementTable(void) {
       /*parent,incl,exclgroups*/          kSpecial, kInlineEntity|kBlockEntity, kNone,	
       /*special props, prop-range*/       kOmitWS, kDefaultPropRange,
       /*special parents,kids,skip*/       0,&gMapKids,eHTMLTag_unknown);
+   
+    Initialize( 
+      /*tag*/                             eHTMLTag_marquee,
+      /*req-parent excl-parent*/          eHTMLTag_unknown,eHTMLTag_unknown,
+      /*rootnodes,endrootnodes*/          &gRootTags,&gRootTags,	
+      /*autoclose starttags and endtags*/ 0,0,0,0,
+      /*parent,incl,exclgroups*/          kBlock, kFlowEntity, kNone,	
+      /*special props, prop-range*/       0, kDefaultPropRange,
+      /*special parents,kids,skip*/       0,0,eHTMLTag_unknown);
 
     Initialize( 
       /*tag*/                             eHTMLTag_menu,
diff --git a/mozilla/htmlparser/src/nsHTMLTags.cpp b/mozilla/htmlparser/src/nsHTMLTags.cpp
index 405def95407..83bb64c62a4 100644
--- a/mozilla/htmlparser/src/nsHTMLTags.cpp
+++ b/mozilla/htmlparser/src/nsHTMLTags.cpp
@@ -175,6 +175,8 @@ static const PRUnichar sHTMLTagUnicodeName_listing[] =
   {'l', 'i', 's', 't', 'i', 'n', 'g', '\0'};
 static const PRUnichar sHTMLTagUnicodeName_map[] =
   {'m', 'a', 'p', '\0'};
+static const PRUnichar sHTMLTagUnicodeName_marquee[] =
+  {'m', 'a', 'r', 'q', 'u', 'e', 'e', '\0'};
 static const PRUnichar sHTMLTagUnicodeName_menu[] =
   {'m', 'e', 'n', 'u', '\0'};
 static const PRUnichar sHTMLTagUnicodeName_meta[] =
@@ -272,7 +274,6 @@ static const PRUnichar sHTMLTagUnicodeName_wbr[] =
 static const PRUnichar sHTMLTagUnicodeName_xmp[] =
   {'x', 'm', 'p', '\0'};
 
-
 // static array of unicode tag names
 #define HTML_TAG(_tag) sHTMLTagUnicodeName_##_tag,
 static const PRUnichar* kTagUnicodeTable[] = {
diff --git a/mozilla/parser/htmlparser/public/nsHTMLTagList.h b/mozilla/parser/htmlparser/public/nsHTMLTagList.h
index ff833da7e43..75f2e381552 100644
--- a/mozilla/parser/htmlparser/public/nsHTMLTagList.h
+++ b/mozilla/parser/htmlparser/public/nsHTMLTagList.h
@@ -124,6 +124,7 @@ HTML_TAG(li)
 HTML_TAG(link)
 HTML_TAG(listing)
 HTML_TAG(map)
+HTML_TAG(marquee)
 HTML_TAG(menu)
 HTML_TAG(meta)
 HTML_TAG(multicol)
diff --git a/mozilla/parser/htmlparser/src/nsElementTable.cpp b/mozilla/parser/htmlparser/src/nsElementTable.cpp
index d6523b2bf87..076b1824cc6 100644
--- a/mozilla/parser/htmlparser/src/nsElementTable.cpp
+++ b/mozilla/parser/htmlparser/src/nsElementTable.cpp
@@ -820,6 +820,15 @@ void InitializeElementTable(void) {
       /*parent,incl,exclgroups*/          kSpecial, kInlineEntity|kBlockEntity, kNone,	
       /*special props, prop-range*/       kOmitWS, kDefaultPropRange,
       /*special parents,kids,skip*/       0,&gMapKids,eHTMLTag_unknown);
+   
+    Initialize( 
+      /*tag*/                             eHTMLTag_marquee,
+      /*req-parent excl-parent*/          eHTMLTag_unknown,eHTMLTag_unknown,
+      /*rootnodes,endrootnodes*/          &gRootTags,&gRootTags,	
+      /*autoclose starttags and endtags*/ 0,0,0,0,
+      /*parent,incl,exclgroups*/          kBlock, kFlowEntity, kNone,	
+      /*special props, prop-range*/       0, kDefaultPropRange,
+      /*special parents,kids,skip*/       0,0,eHTMLTag_unknown);
 
     Initialize( 
       /*tag*/                             eHTMLTag_menu,
diff --git a/mozilla/parser/htmlparser/src/nsHTMLTags.cpp b/mozilla/parser/htmlparser/src/nsHTMLTags.cpp
index 405def95407..83bb64c62a4 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLTags.cpp
+++ b/mozilla/parser/htmlparser/src/nsHTMLTags.cpp
@@ -175,6 +175,8 @@ static const PRUnichar sHTMLTagUnicodeName_listing[] =
   {'l', 'i', 's', 't', 'i', 'n', 'g', '\0'};
 static const PRUnichar sHTMLTagUnicodeName_map[] =
   {'m', 'a', 'p', '\0'};
+static const PRUnichar sHTMLTagUnicodeName_marquee[] =
+  {'m', 'a', 'r', 'q', 'u', 'e', 'e', '\0'};
 static const PRUnichar sHTMLTagUnicodeName_menu[] =
   {'m', 'e', 'n', 'u', '\0'};
 static const PRUnichar sHTMLTagUnicodeName_meta[] =
@@ -272,7 +274,6 @@ static const PRUnichar sHTMLTagUnicodeName_wbr[] =
 static const PRUnichar sHTMLTagUnicodeName_xmp[] =
   {'x', 'm', 'p', '\0'};
 
-
 // static array of unicode tag names
 #define HTML_TAG(_tag) sHTMLTagUnicodeName_##_tag,
 static const PRUnichar* kTagUnicodeTable[] = {