diff --git a/lib/src/clixon_string.c b/lib/src/clixon_string.c
index 9a741265..2bce6d62 100644
--- a/lib/src/clixon_string.c
+++ b/lib/src/clixon_string.c
@@ -530,6 +530,7 @@ xml_chardata_encode(char      **escp,
                 len += strlen("&");
                 break;
             case '<':
+	      // <![CDATA[
                 if (strncmp(&str[i], "<![CDATA[", strlen("<![CDATA[")) == 0){
                     len++;
                     cdata++;
@@ -801,6 +802,7 @@ xml_chardata_decode(char      **decp,
     int     j;
     char    ch;
     int     ret;
+    int     cdata;
 
     /* Two steps: (1) read in the complete format string */
     va_start(args, fmt); /* dryrun */
@@ -824,18 +826,34 @@ xml_chardata_decode(char      **decp,
         goto done;
     }
     j = 0;
+    cdata = 0;
     memset(dec, 0, slen+1);
     for (i=0; i<slen; i++){
+      if (cdata) {
+	if ((i+2) < slen) && (strncmp(&str[i], "]]>", strlen("]]>")) == 0)){
+	  cdata = 0;
+	  i += 2;
+        } else {
+	  dec[j++] = str[i];
+	}
+      } else {
         ch = str[i];
         switch (ch){
         case '&':
-            if ((ret = xml_chardata_decode_ampersand(&str[i+1], &ch, &i)) < 0)
-                goto done;
-            if (ret == 0)
-                dec[j++] = str[i];
-            else
-                dec[j++] = ch;
-            break;
+	  if ((ret = xml_chardata_decode_ampersand(&str[i+1], &ch, &i)) < 0)
+	    goto done;
+	  if (ret == 0)
+	    dec[j++] = str[i];
+	  else
+	    dec[j++] = ch;
+	  break;
+	case '<':
+	  if (strncmp(&str[i], "<![CDATA[", strlen("<![CDATA[")) == 0){
+	    cdata++;
+	    i += 8;
+	    break;
+	  }
+		
         default:
             dec[j++] = str[i];
         }