diff --git a/expat/xmlwf/xmlwf.c b/expat/xmlwf/xmlwf.c
index a7d64d87..7a6f77cf 100755
--- a/expat/xmlwf/xmlwf.c
+++ b/expat/xmlwf/xmlwf.c
@@ -46,8 +46,10 @@ static void characterData(void *userData, const char *s, int len)
     case '"':
       fputs(""", fp);
       break;
-    case '\r':
-      fputs("
", fp);
+    case 9:
+    case 10:
+    case 13:
+      fprintf(fp, "&#%d;", *s);
       break;
     default:
       putc(*s, fp);