diff --git a/gsf/gsf-docprop-vector.c b/gsf/gsf-docprop-vector.c
index 57004d7..0515182 100644
--- a/gsf/gsf-docprop-vector.c
+++ b/gsf/gsf-docprop-vector.c
@@ -107,7 +107,11 @@ gsf_docprop_vector_as_string (GsfDocPropVector const *vector)
 
 		v = g_value_array_get_nth (vector->gva, i);
 		str = g_strdup_value_contents (v);
-		rstring = g_strconcat (rstring, str, ",", NULL);
+		if (G_VALUE_HOLDS(v, G_TYPE_STRING)) {
+			rstring = g_strconcat (rstring, str, ",", NULL);
+		} else {
+			rstring = g_strconcat (rstring, G_VALUE_TYPE_NAME(v), ":", str, ",", NULL);
+		}
 		g_free (str);
 	}
 
diff --git a/gsf/gsf-libxml.c b/gsf/gsf-libxml.c
index 31bf805..bd2c97f 100644
--- a/gsf/gsf-libxml.c
+++ b/gsf/gsf-libxml.c
@@ -27,6 +27,7 @@
 #include <gsf/gsf-impl-utils.h>
 #include <gsf/gsf-utils.h>
 #include <gsf/gsf-timestamp.h>
+#include <gsf/gsf-docprop-vector.h>
 #include <glib/gi18n-lib.h>
 
 #include <math.h>
@@ -187,6 +188,21 @@ glade_string_from_flags (GType type, guint flags)
     return ret;
 }
 
+static void
+gsf_xml_gvalue_from_str_unescape (char *str)
+{
+	char *end = str + strlen (str);
+	char *ptr = str;
+	while (*ptr != 0) {
+		if (*ptr == '\\') {
+			memmove (ptr, ptr+1, (ptr + 1) - end);
+			if (*ptr != 0)
+				ptr++;
+		} else
+			ptr++;	
+	}
+}
+
 /**
  * gsf_xml_gvalue_from_str :
  * @res : Result value
@@ -258,6 +274,7 @@ gsf_xml_gvalue_from_str (GValue *res, GType t, char const *str)
 		break;
 
 	default:
+
 		if (GSF_TIMESTAMP_TYPE == t) {
 			GsfTimestamp *ts = gsf_timestamp_new ();
 			gboolean ok = gsf_timestamp_from_string (str, ts);
@@ -266,6 +283,89 @@ gsf_xml_gvalue_from_str (GValue *res, GType t, char const *str)
 			gsf_timestamp_free (ts);
 			if (ok)
 				break;
+		} else if (GSF_DOCPROP_VECTOR_TYPE == t) {
+			GsfDocPropVector *vector = gsf_docprop_vector_new ();
+			GValue *v = g_new0 (GValue, 1);
+			g_value_init (v, G_TYPE_STRING);
+			while (*str != 0) {
+				char *str_dup = NULL;
+				if (*str == '"') {
+					GString *gstr = g_string_new (NULL);
+					char const *ptr = str+1;
+					while (*ptr != 0) {
+						if (*ptr == '\\') {
+							ptr++;
+							if (*ptr != 0) {
+								g_string_append_c (gstr, *ptr);
+								ptr++;
+							}
+						} else if (*ptr == '"') {
+							ptr++;
+							while (*ptr != ',' && *ptr != 0)
+								ptr++;
+							if (*ptr == ',')
+								ptr++;
+							break;
+						} else {
+							g_string_append_c (gstr, *ptr);
+							ptr++;
+						}
+					}
+					str = ptr;
+					str_dup = g_string_free (gstr, FALSE);
+					g_value_take_string (v, str_dup);
+					gsf_docprop_vector_append (vector, v);
+				} else {
+					GValue *v2 = NULL;
+					GType t = G_TYPE_INVALID;
+					char *end = strchr (str, ',');
+					char *type_end =  strchr (str, ':');
+					if (type_end != NULL && (end == NULL || type_end < end)) {
+						char *type = g_strndup (str, (type_end - str));
+						t = g_type_from_name (type);
+						if (t != G_TYPE_INVALID) {
+							v2 = g_new0 (GValue, 1);
+							g_value_init (v2, t);
+						}
+						str = type_end + 1;
+					}
+					if (end) {
+						str_dup = g_strndup (str, end - str);
+						str = end + 1;
+					} else {
+						str_dup = g_strdup (str);
+						str = end;
+					}
+					if (v2 && t == G_TYPE_INT) {
+						int i = atoi (str_dup);
+						g_free (str_dup);
+						g_value_set_int (v2, i);
+						gsf_docprop_vector_append (vector, v2);
+					} else {
+						gsf_xml_gvalue_from_str_unescape (str_dup);
+						g_value_take_string (v, str_dup);
+						if (v2 != NULL) {
+							if (g_value_transform (v, v2))
+								gsf_docprop_vector_append (vector, v2);
+							else {
+								g_printerr
+									("Unable to convert gtype G_TYPE_STRING (%s) to %i\n", 
+									 str_dup, (int)t);
+								gsf_docprop_vector_append (vector, v);
+							}
+						} else
+							gsf_docprop_vector_append (vector, v);
+					}
+					if (v2) {
+						g_value_unset (v2);
+						g_free (v2);
+					}
+				}
+			}
+			g_value_unset (v);
+			g_free (v);
+			g_value_set_object (res, vector);
+			break;
 		} else g_warning ("gsf_xml_gvalue_from_str(): Don't know how to handle type '%s'", g_type_name (t));
 
 		return FALSE;
@@ -1926,6 +2026,15 @@ gsf_xml_out_add_gvalue (GsfXMLOut *xout, char const *id, GValue const *val)
 			gsf_xml_out_add_cstr (xout, id, str);
 			g_free (str);
 			break;
+		} else if (GSF_DOCPROP_VECTOR_TYPE == t) {
+			GsfDocPropVector *v = gsf_value_get_docprop_vector (val);
+			char *str = gsf_docprop_vector_as_string (v);
+			char *full_str = g_strdup_printf
+				("GSF_DOCPROP_VECTOR_TYPE:%s", str);
+			gsf_xml_out_add_cstr (xout, id, full_str);
+			g_free (full_str);
+			g_free (str);
+			break;
 		}
 	}
 
diff --git a/gsf/gsf-opendoc-utils.c b/gsf/gsf-opendoc-utils.c
index 2df4daa..f26da9f 100644
--- a/gsf/gsf-opendoc-utils.c
+++ b/gsf/gsf-opendoc-utils.c
@@ -213,7 +213,7 @@ static void
 od_meta_user_defined (GsfXMLIn *xin,  xmlChar const **attrs)
 {
 	GsfOOMetaIn *mi = (GsfOOMetaIn *)xin->user_state;
-	mi->typ = G_TYPE_STRING;
+	mi->typ = G_TYPE_NONE;
 	mi->name = NULL;
 
 	for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2) {
@@ -257,10 +257,17 @@ od_meta_user_defined_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
 	GsfOOMetaIn *mi = (GsfOOMetaIn *)xin->user_state;
 
 	if (mi->name != NULL) {
+		char const *str = xin->content->str;
 		GValue *res = g_new0 (GValue, 1);
 		GType t = mi->typ;
-		if (t == G_TYPE_NONE) t = G_TYPE_STRING;
-		if (gsf_xml_gvalue_from_str (res, t, xin->content->str)) {
+		if (t == G_TYPE_NONE) {
+			if (g_str_has_prefix (xin->content->str, "GSF_DOCPROP_VECTOR_TYPE:")) {
+				t = GSF_DOCPROP_VECTOR_TYPE;
+				str += strlen ("GSF_DOCPROP_VECTOR_TYPE:");
+			} else
+				t = G_TYPE_STRING;
+		}
+		if (gsf_xml_gvalue_from_str (res, t, str)) {
 			gsf_doc_meta_data_insert (mi->md, mi->name, res);
 			mi->name = NULL;
 		} else {
@@ -551,6 +558,8 @@ meta_write_props (char const *prop_name, GsfDocProp *prop, GsfXMLOut *output)
 		default:
 			if (GSF_TIMESTAMP_TYPE == t)
 				type_name = "date";
+			else if (GSF_DOCPROP_VECTOR_TYPE == t)
+				{/* We will write only character data */};
 		}
 		if (NULL != type_name)
 			gsf_xml_out_add_cstr (output, "meta:value-type", type_name);
