Index: epan/dissectors/packet-xml.c
===================================================================
--- epan/dissectors/packet-xml.c	(revision 34547)
+++ epan/dissectors/packet-xml.c	(working copy)
@@ -933,7 +933,7 @@
 	new->fqn = fqn;
 
 	add_xml_field(hfs, &(new->hf_tag), g_strdup(elem_name), fqn);
-	add_xml_field(hfs, &(new->hf_cdata), g_strdup(elem_name), fqn);
+	new->hf_cdata = new->hf_tag;
 
 	ett_p = &new->ett;
 	g_array_append_val(etts,ett_p);
@@ -1139,7 +1139,7 @@
 			new->fqn = fully_qualified_name(hier, curr_name, root_name);
 
 			add_xml_field(hfs, &(new->hf_tag), curr_name, new->fqn);
-			add_xml_field(hfs, &(new->hf_cdata), curr_name, new->fqn);
+			new->hf_cdata = new->hf_tag;
 
 			d.basename = new->fqn;
 			d.hf = hfs;
@@ -1173,9 +1173,8 @@
 		ett_p = &root_element->ett;
 		g_array_append_val(etts,ett_p);
 
-		add_xml_field(hfs, &root_element->hf_cdata, root_element->name, root_element->fqn);
-
 		root_element->hf_tag = proto_register_protocol(dtd_data->description, dtd_data->proto_name, dtd_data->proto_name);
+		root_element->hf_cdata = root_element->hf_tag;
 		proto_register_field_array(root_element->hf_tag, (hf_register_info*)g_array_data(hfs), hfs->len);
 		proto_register_subtree_array((gint**)g_array_data(etts), etts->len);