diff --git a/src/xercesc/framework/XMLFormatter.cpp b/src/xercesc/framework/XMLFormatter.cpp
index f6ae8d4d91d632022a558f8a4e52f77d50d938f3..f0d9a3a620febfccba8c2fff0f88cd52f6a4ac0e 100644
--- a/src/xercesc/framework/XMLFormatter.cpp
+++ b/src/xercesc/framework/XMLFormatter.cpp
@@ -74,13 +74,13 @@ static const XMLCh  gQuoteRef[] =
     chAmpersand, chLatin_q, chLatin_u, chLatin_o, chLatin_t, chSemiColon, chNull
 };
 
-static const unsigned int kEscapeCount = 6;
+static const unsigned int kEscapeCount = 7;
 static const XMLCh gEscapeChars[XMLFormatter::EscapeFlags_Count][kEscapeCount] =
 {
-        { chNull      , chNull       , chNull        , chNull       , chNull        , chNull }
-    ,   { chAmpersand , chCloseAngle , chDoubleQuote , chOpenAngle  , chSingleQuote , chNull }
-    ,   { chAmpersand , chOpenAngle  , chDoubleQuote , chLF         , chNull        , chNull }
-    ,   { chAmpersand , chOpenAngle  , chCloseAngle  , chNull       , chNull        , chNull }
+        { chNull      , chNull       , chNull        , chNull       , chNull        , chNull    , chNull }
+    ,   { chAmpersand , chCloseAngle , chDoubleQuote , chOpenAngle  , chSingleQuote , chNull    , chNull }
+    ,   { chAmpersand , chOpenAngle  , chDoubleQuote , chLF         , chCR          , chHTab    , chNull }
+    ,   { chAmpersand , chOpenAngle  , chCloseAngle  , chNull       , chNull        , chNull    , chNull }
 };
 
 // ---------------------------------------------------------------------------