diff --git a/utils/xmldump.php b/utils/xmldump.php
index d3240be2a..3a449aed5 100644
--- a/utils/xmldump.php
+++ b/utils/xmldump.php
@@ -276,7 +276,7 @@ function tree($folder, $parent=null, $indent='', $skipcurrent=false) { /* {{{ */
 			if($attributes = $document->getAttributes()) {
 				foreach($attributes as $attribute) {
 					$attrdef = $attribute->getAttributeDefinition();
-					echo $indent." <attr type=\"user\" attrdef=\"".$attrdef->getID()."\">".$attribute->getValue()."</attr>\n";
+					echo $indent." <attr type=\"user\" attrdef=\"".$attrdef->getID()."\">".wrapWithCData($attribute->getValue())."</attr>\n";
 				}
 			}
 
@@ -332,7 +332,7 @@ function tree($folder, $parent=null, $indent='', $skipcurrent=false) { /* {{{ */
 					if($attributes = $version->getAttributes()) {
 						foreach($attributes as $attribute) {
 							$attrdef = $attribute->getAttributeDefinition();
-							echo $indent."   <attr type=\"user\" attrdef=\"".$attrdef->getID()."\">".$attribute->getValue()."</attr>\n";
+							echo $indent."   <attr type=\"user\" attrdef=\"".$attrdef->getID()."\">".wrapWithCData($attribute->getValue())."</attr>\n";
 						}
 					}
 					if($statuslog = $version->getStatusLog()) {
@@ -625,7 +625,7 @@ if($attrdefs) {
 		echo "\">\n";
 		echo "  <attr name=\"name\">".$attrdef->getName()."</attr>\n";
 		echo "  <attr name=\"multiple\">".$attrdef->getMultipleValues()."</attr>\n";
-		echo "  <attr name=\"valueset\">".$attrdef->getValueSet()."</attr>\n";
+		echo "  <attr name=\"valueset\">".wrapWithCData($attrdef->getValueSet())."</attr>\n";
 		echo "  <attr name=\"type\">".$attrdef->getType()."</attr>\n";
 		echo "  <attr name=\"minvalues\">".$attrdef->getMinValues()."</attr>\n";
 		echo "  <attr name=\"maxvalues\">".$attrdef->getMaxValues()."</attr>\n";