diff --git a/addressbook/backends/google/e-book-backend-google.c b/addressbook/backends/google/e-book-backend-google.c
index 9ff375f..117d876 100644
--- a/addressbook/backends/google/e-book-backend-google.c
+++ b/addressbook/backends/google/e-book-backend-google.c
@@ -2710,6 +2710,31 @@ remove_anniversary (GDataContactsContact *contact)
 }
 
 static gboolean
+is_known_gdata_website_type (const gchar *type)
+{
+	gint ii;
+	const gchar *known_types[] = {
+		GDATA_GCONTACT_WEBSITE_HOME_PAGE,
+		GDATA_GCONTACT_WEBSITE_BLOG,
+		GDATA_GCONTACT_WEBSITE_PROFILE,
+		GDATA_GCONTACT_WEBSITE_HOME,
+		GDATA_GCONTACT_WEBSITE_WORK,
+		GDATA_GCONTACT_WEBSITE_OTHER,
+		GDATA_GCONTACT_WEBSITE_FTP
+	};
+		
+	if (!type)
+		return FALSE;
+
+	for (ii = 0; ii < G_N_ELEMENTS (known_types); ii++) {
+		if (g_ascii_strcasecmp (type, known_types[ii]) == 0)
+			return TRUE;
+	}
+
+	return FALSE;
+}
+
+static gboolean
 _gdata_entry_update_from_e_contact (EBookBackend *backend,
                                     GDataEntry *entry,
                                     EContact *contact)
@@ -2842,14 +2867,28 @@ _gdata_entry_update_from_e_contact (EBookBackend *backend,
 				g_object_unref (im);
 			}
 		} else if (0 == g_ascii_strcasecmp (name, "X-URIS")) {
-			GList *param;
+			gchar *url;
 
-			param = e_vcard_attribute_get_param (attr, EVC_TYPE);
-			if (param) {
+			url = e_vcard_attribute_get_value (attr);
+			if (url) {
+				GList *param;
+				const gchar *type, *label;
 				GDataGContactWebsite *website;
-				gchar *url = e_vcard_attribute_get_value (attr);
 
-				website = gdata_gcontact_website_new (url, param->data, NULL, FALSE);
+				param = e_vcard_attribute_get_param (attr, EVC_TYPE);
+				type = param ? param->data : NULL;
+
+				param = e_vcard_attribute_get_param (attr, EVC_LABEL);
+				label = param ? param->data : NULL;
+
+				if (!is_known_gdata_website_type (type)) {
+					if (!label)
+						label = type;
+
+					type = GDATA_GCONTACT_WEBSITE_OTHER;
+				}
+
+				website = gdata_gcontact_website_new (url, type, label, FALSE);
 				if (website) {
 					gdata_contacts_contact_add_website (GDATA_CONTACTS_CONTACT (entry), website);
 					g_object_unref (website);
@@ -3153,13 +3192,14 @@ _e_contact_new_from_gdata_entry (EBookBackend *backend,
 	websites = gdata_contacts_contact_get_websites (GDATA_CONTACTS_CONTACT (entry));
 	for (itr = websites; itr != NULL; itr = itr->next) {
 		GDataGContactWebsite *website = itr->data;
-		const gchar *uri, *reltype;
+		const gchar *uri, *reltype, *label;
 
 		if (!website)
 			continue;
 
 		uri = gdata_gcontact_website_get_uri (website);
 		reltype = gdata_gcontact_website_get_relation_type (website);
+		label = gdata_gcontact_website_get_label (website);
 
 		if (!uri || !*uri || !reltype)
 			continue;
@@ -3173,6 +3213,9 @@ _e_contact_new_from_gdata_entry (EBookBackend *backend,
 		} else {
 			EVCardAttribute *attr = e_vcard_attribute_new (NULL, "X-URIS");
 
+			if (label && *label)
+				e_vcard_attribute_add_param_with_value (attr, e_vcard_attribute_param_new (EVC_LABEL), label);
+
 			e_vcard_attribute_add_param_with_value (attr, e_vcard_attribute_param_new (EVC_TYPE), reltype);
 			e_vcard_append_attribute_with_value (vcard, attr, uri);
 		}
