diff --git a/mozilla/htmlparser/src/nsHTMLTokens.cpp b/mozilla/htmlparser/src/nsHTMLTokens.cpp
index c517d15d43f..74e689e7f6b 100644
--- a/mozilla/htmlparser/src/nsHTMLTokens.cpp
+++ b/mozilla/htmlparser/src/nsHTMLTokens.cpp
@@ -447,7 +447,7 @@ nsresult CTextToken::Consume(PRUnichar aChar, nsScanner& aScanner) {
     result=aScanner.ReadUntil(mTextValue,theTerminals,PR_FALSE,PR_FALSE);
     if(NS_OK==result) {
       result=aScanner.Peek(aChar);
-      if((kCR==aChar) && (NS_OK==result)) {
+      if(((kCR==aChar) || (kNewLine==aChar)) && (NS_OK==result)) {
         result=aScanner.GetChar(aChar); //strip off the \r
         result=aScanner.Peek(aChar);    //then see what's next.
         if(NS_OK==result) {
diff --git a/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp b/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp
index c517d15d43f..74e689e7f6b 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp
+++ b/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp
@@ -447,7 +447,7 @@ nsresult CTextToken::Consume(PRUnichar aChar, nsScanner& aScanner) {
     result=aScanner.ReadUntil(mTextValue,theTerminals,PR_FALSE,PR_FALSE);
     if(NS_OK==result) {
       result=aScanner.Peek(aChar);
-      if((kCR==aChar) && (NS_OK==result)) {
+      if(((kCR==aChar) || (kNewLine==aChar)) && (NS_OK==result)) {
         result=aScanner.GetChar(aChar); //strip off the \r
         result=aScanner.Peek(aChar);    //then see what's next.
         if(NS_OK==result) {