diff --git a/mozilla/editor/libeditor/html/nsHTMLEditUtils.cpp b/mozilla/editor/libeditor/html/nsHTMLEditUtils.cpp
index 84126b3a438..743d6872e65 100644
--- a/mozilla/editor/libeditor/html/nsHTMLEditUtils.cpp
+++ b/mozilla/editor/libeditor/html/nsHTMLEditUtils.cpp
@@ -658,7 +658,6 @@ static const nsElementInfo kElements[eHTMLTag_userdefined] = {
        GROUP_LEAF),
   ELEM(select, PR_TRUE, PR_FALSE, GROUP_FORMCONTROL, GROUP_SELECT_CONTENT),
   ELEM(small, PR_TRUE, PR_TRUE, GROUP_FONTSTYLE, GROUP_INLINE_ELEMENT),
-  ELEM(sound, PR_FALSE, PR_FALSE, GROUP_NONE, GROUP_NONE),
   ELEM(spacer, PR_FALSE, PR_FALSE, GROUP_NONE, GROUP_NONE),
   ELEM(span, PR_TRUE, PR_TRUE, GROUP_SPECIAL, GROUP_INLINE_ELEMENT),
   ELEM(strike, PR_TRUE, PR_TRUE, GROUP_FONTSTYLE, GROUP_INLINE_ELEMENT),
diff --git a/mozilla/parser/htmlparser/public/nsHTMLTagList.h b/mozilla/parser/htmlparser/public/nsHTMLTagList.h
index 3db9a14918c..1e5c8c756c1 100644
--- a/mozilla/parser/htmlparser/public/nsHTMLTagList.h
+++ b/mozilla/parser/htmlparser/public/nsHTMLTagList.h
@@ -147,7 +147,6 @@ HTML_TAG(samp, Span)
 HTML_TAG(script, Script)
 HTML_TAG(select, Select)
 HTML_TAG(small, Span)
-HTML_TAG(sound, Span)
 HTML_TAG(spacer, Shared)
 HTML_TAG(span, Span)
 HTML_TAG(strike, Span)
diff --git a/mozilla/parser/htmlparser/src/nsElementTable.cpp b/mozilla/parser/htmlparser/src/nsElementTable.cpp
index 4e0e8aafe93..32636c1e00f 100644
--- a/mozilla/parser/htmlparser/src/nsElementTable.cpp
+++ b/mozilla/parser/htmlparser/src/nsElementTable.cpp
@@ -1034,17 +1034,6 @@ const nsHTMLElement gHTMLElements[] = {
     /*special parents,kids,skip*/       0,0,eHTMLTag_unknown,
     /*contain-func*/                    0
   },
-  {
-    
-    /*tag*/                             eHTMLTag_sound,
-    /*req-parent excl-parent*/          eHTMLTag_unknown,eHTMLTag_unknown,
-    /*rootnodes,endrootnodes*/          &gRootTags,&gRootTags,
-    /*autoclose starttags and endtags*/ 0,0,0,0,
-    /*parent,incl,exclgroups*/          (kFlowEntity|kHeadMisc), kNone, kNone,  // Added kFlowEntity|kHeadMisc & kNonContainer in
-    /*special props, prop-range*/       kNonContainer,kDefaultPropRange,        // Ref. to Bug 25749
-    /*special parents,kids,skip*/       0,0,eHTMLTag_unknown,
-    /*contain-func*/                    0
-  },
   {
     
     /*tag*/                             eHTMLTag_spacer,
diff --git a/mozilla/parser/htmlparser/src/nsHTMLTags.cpp b/mozilla/parser/htmlparser/src/nsHTMLTags.cpp
index 4414d534e3b..1e00aeb851a 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLTags.cpp
+++ b/mozilla/parser/htmlparser/src/nsHTMLTags.cpp
@@ -215,8 +215,6 @@ static const PRUnichar sHTMLTagUnicodeName_select[] =
   {'s', 'e', 'l', 'e', 'c', 't', '\0'};
 static const PRUnichar sHTMLTagUnicodeName_small[] =
   {'s', 'm', 'a', 'l', 'l', '\0'};
-static const PRUnichar sHTMLTagUnicodeName_sound[] =
-  {'s', 'o', 'u', 'n', 'd', '\0'};
 static const PRUnichar sHTMLTagUnicodeName_spacer[] =
   {'s', 'p', 'a', 'c', 'e', 'r', '\0'};
 static const PRUnichar sHTMLTagUnicodeName_span[] =