diff --git a/mozilla/content/xml/document/src/nsXMLContentSink.cpp b/mozilla/content/xml/document/src/nsXMLContentSink.cpp
index b30c706909f..dae753f5732 100644
--- a/mozilla/content/xml/document/src/nsXMLContentSink.cpp
+++ b/mozilla/content/xml/document/src/nsXMLContentSink.cpp
@@ -1228,7 +1228,7 @@ nsXMLContentSink::AddDocTypeDecl(const nsIParserNode& aNode, PRInt32 aMode)
   nsAutoString docTypeStr(aNode.GetText()); 
   nsAutoString str, name, publicId, systemId;
 
-  if (docTypeStr.EqualsWithConversion("<!DOCTYPE", PR_FALSE, 9)) {
+  if (docTypeStr.EqualsWithConversion("<!DOCTYPE", PR_FALSE, 10)) {
     docTypeStr.Right(str, docTypeStr.Length()-9);
   }
 
diff --git a/mozilla/htmlparser/src/nsDTDUtils.cpp b/mozilla/htmlparser/src/nsDTDUtils.cpp
index bba36f66711..0b7e7115e0d 100644
--- a/mozilla/htmlparser/src/nsDTDUtils.cpp
+++ b/mozilla/htmlparser/src/nsDTDUtils.cpp
@@ -1246,7 +1246,7 @@ CToken* nsTokenAllocator::CreateTokenOfType(eHTMLTokenTypes aType,eHTMLTags aTag
     case eToken_instruction:      result=new(mArenaPool) CInstructionToken(aString); break;
     case eToken_cdatasection:     result=new(mArenaPool) CCDATASectionToken(aString); break;
     case eToken_error:            result=new(mArenaPool) CErrorToken(); break;
-    case eToken_doctypeDecl:      result=new(mArenaPool) CDoctypeDeclToken(); break;
+    case eToken_doctypeDecl:      result=new(mArenaPool) CDoctypeDeclToken(aString); break;
       default:
         NS_ASSERTION(PR_FALSE, "nsDTDUtils::CreateTokenOfType: illegal token type"); 
         break;
diff --git a/mozilla/htmlparser/src/nsExpatTokenizer.cpp b/mozilla/htmlparser/src/nsExpatTokenizer.cpp
index 99e8b53aa88..80d360944f4 100644
--- a/mozilla/htmlparser/src/nsExpatTokenizer.cpp
+++ b/mozilla/htmlparser/src/nsExpatTokenizer.cpp
@@ -65,7 +65,6 @@ static NS_DEFINE_IID(kITokenizerIID,      NS_ITOKENIZER_IID);
 static NS_DEFINE_IID(kHTMLTokenizerIID,   NS_HTMLTOKENIZER_IID);
 static NS_DEFINE_IID(kClassIID,           NS_EXPATTOKENIZER_IID);
 
-static const char* kDocTypeDeclPrefix = "<!DOCTYPE";
 static const char* kChromeProtocol = "chrome";
 static const char* kDTDDirectory = "dtd/";
 static const char kHTMLNameSpaceURI[] = "http://www.w3.org/1999/xhtml";
@@ -904,7 +903,7 @@ void nsExpatTokenizer::HandleStartDoctypeDecl(void *userData,
 {  
   XMLParserState* state = (XMLParserState*) userData;
   state->indoctype = PR_TRUE;
-  state->doctypeText.Assign((PRUnichar*)kDocTypeDeclPrefix);
+  state->doctypeText.Assign(NS_LITERAL_STRING("<!DOCTYPE "));
 }
 
 void nsExpatTokenizer::HandleEndDoctypeDecl(void *userData)
diff --git a/mozilla/htmlparser/src/nsHTMLTokens.cpp b/mozilla/htmlparser/src/nsHTMLTokens.cpp
index 61f94a0bdc8..986ee49882c 100644
--- a/mozilla/htmlparser/src/nsHTMLTokens.cpp
+++ b/mozilla/htmlparser/src/nsHTMLTokens.cpp
@@ -2091,7 +2091,12 @@ const nsAReadableString& CErrorToken::GetStringValue(void)
 
 // Doctype decl token
 
-CDoctypeDeclToken::CDoctypeDeclToken(eHTMLTags aTag) : CHTMLToken(aTag) {
+CDoctypeDeclToken::CDoctypeDeclToken(eHTMLTags aTag)
+  : CHTMLToken(aTag) {
+}
+
+CDoctypeDeclToken::CDoctypeDeclToken(const nsAReadableString& aString,eHTMLTags aTag)
+  : CHTMLToken(aTag), mTextValue(aString) {
 }
 
 /**
diff --git a/mozilla/htmlparser/src/nsHTMLTokens.h b/mozilla/htmlparser/src/nsHTMLTokens.h
index 73dd88d9a07..de8ad22bdf2 100644
--- a/mozilla/htmlparser/src/nsHTMLTokens.h
+++ b/mozilla/htmlparser/src/nsHTMLTokens.h
@@ -452,6 +452,7 @@ protected:
 class CDoctypeDeclToken: public CHTMLToken {
 public:
                         CDoctypeDeclToken(eHTMLTags aTag=eHTMLTag_unknown);
+                        CDoctypeDeclToken(const nsAReadableString& aString,eHTMLTags aTag=eHTMLTag_unknown);
     virtual nsresult    Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
     virtual const char* GetClassName(void);
     virtual PRInt32     GetTokenType(void);
diff --git a/mozilla/layout/xml/document/src/nsXMLContentSink.cpp b/mozilla/layout/xml/document/src/nsXMLContentSink.cpp
index b30c706909f..dae753f5732 100644
--- a/mozilla/layout/xml/document/src/nsXMLContentSink.cpp
+++ b/mozilla/layout/xml/document/src/nsXMLContentSink.cpp
@@ -1228,7 +1228,7 @@ nsXMLContentSink::AddDocTypeDecl(const nsIParserNode& aNode, PRInt32 aMode)
   nsAutoString docTypeStr(aNode.GetText()); 
   nsAutoString str, name, publicId, systemId;
 
-  if (docTypeStr.EqualsWithConversion("<!DOCTYPE", PR_FALSE, 9)) {
+  if (docTypeStr.EqualsWithConversion("<!DOCTYPE", PR_FALSE, 10)) {
     docTypeStr.Right(str, docTypeStr.Length()-9);
   }
 
diff --git a/mozilla/parser/htmlparser/src/nsDTDUtils.cpp b/mozilla/parser/htmlparser/src/nsDTDUtils.cpp
index bba36f66711..0b7e7115e0d 100644
--- a/mozilla/parser/htmlparser/src/nsDTDUtils.cpp
+++ b/mozilla/parser/htmlparser/src/nsDTDUtils.cpp
@@ -1246,7 +1246,7 @@ CToken* nsTokenAllocator::CreateTokenOfType(eHTMLTokenTypes aType,eHTMLTags aTag
     case eToken_instruction:      result=new(mArenaPool) CInstructionToken(aString); break;
     case eToken_cdatasection:     result=new(mArenaPool) CCDATASectionToken(aString); break;
     case eToken_error:            result=new(mArenaPool) CErrorToken(); break;
-    case eToken_doctypeDecl:      result=new(mArenaPool) CDoctypeDeclToken(); break;
+    case eToken_doctypeDecl:      result=new(mArenaPool) CDoctypeDeclToken(aString); break;
       default:
         NS_ASSERTION(PR_FALSE, "nsDTDUtils::CreateTokenOfType: illegal token type"); 
         break;
diff --git a/mozilla/parser/htmlparser/src/nsExpatTokenizer.cpp b/mozilla/parser/htmlparser/src/nsExpatTokenizer.cpp
index 99e8b53aa88..80d360944f4 100644
--- a/mozilla/parser/htmlparser/src/nsExpatTokenizer.cpp
+++ b/mozilla/parser/htmlparser/src/nsExpatTokenizer.cpp
@@ -65,7 +65,6 @@ static NS_DEFINE_IID(kITokenizerIID,      NS_ITOKENIZER_IID);
 static NS_DEFINE_IID(kHTMLTokenizerIID,   NS_HTMLTOKENIZER_IID);
 static NS_DEFINE_IID(kClassIID,           NS_EXPATTOKENIZER_IID);
 
-static const char* kDocTypeDeclPrefix = "<!DOCTYPE";
 static const char* kChromeProtocol = "chrome";
 static const char* kDTDDirectory = "dtd/";
 static const char kHTMLNameSpaceURI[] = "http://www.w3.org/1999/xhtml";
@@ -904,7 +903,7 @@ void nsExpatTokenizer::HandleStartDoctypeDecl(void *userData,
 {  
   XMLParserState* state = (XMLParserState*) userData;
   state->indoctype = PR_TRUE;
-  state->doctypeText.Assign((PRUnichar*)kDocTypeDeclPrefix);
+  state->doctypeText.Assign(NS_LITERAL_STRING("<!DOCTYPE "));
 }
 
 void nsExpatTokenizer::HandleEndDoctypeDecl(void *userData)
diff --git a/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp b/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp
index 61f94a0bdc8..986ee49882c 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp
+++ b/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp
@@ -2091,7 +2091,12 @@ const nsAReadableString& CErrorToken::GetStringValue(void)
 
 // Doctype decl token
 
-CDoctypeDeclToken::CDoctypeDeclToken(eHTMLTags aTag) : CHTMLToken(aTag) {
+CDoctypeDeclToken::CDoctypeDeclToken(eHTMLTags aTag)
+  : CHTMLToken(aTag) {
+}
+
+CDoctypeDeclToken::CDoctypeDeclToken(const nsAReadableString& aString,eHTMLTags aTag)
+  : CHTMLToken(aTag), mTextValue(aString) {
 }
 
 /**
diff --git a/mozilla/parser/htmlparser/src/nsHTMLTokens.h b/mozilla/parser/htmlparser/src/nsHTMLTokens.h
index 73dd88d9a07..de8ad22bdf2 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLTokens.h
+++ b/mozilla/parser/htmlparser/src/nsHTMLTokens.h
@@ -452,6 +452,7 @@ protected:
 class CDoctypeDeclToken: public CHTMLToken {
 public:
                         CDoctypeDeclToken(eHTMLTags aTag=eHTMLTag_unknown);
+                        CDoctypeDeclToken(const nsAReadableString& aString,eHTMLTags aTag=eHTMLTag_unknown);
     virtual nsresult    Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
     virtual const char* GetClassName(void);
     virtual PRInt32     GetTokenType(void);