diff --git a/sbin/gpt/backup.c b/sbin/gpt/backup.c
index 2d60af783ae8..871df517bc1d 100644
--- a/sbin/gpt/backup.c
+++ b/sbin/gpt/backup.c
@@ -33,7 +33,7 @@
 __FBSDID("$FreeBSD: src/sbin/gpt/show.c,v 1.14 2006/06/22 22:22:32 marcel Exp $");
 #endif
 #ifdef __RCSID
-__RCSID("$NetBSD: backup.c,v 1.11 2015/12/01 16:32:19 christos Exp $");
+__RCSID("$NetBSD: backup.c,v 1.12 2015/12/02 04:06:47 christos Exp $");
 #endif
 
 #include <sys/bootblock.h>
@@ -72,20 +72,184 @@ struct gpt_cmd c_backup = {
 		return -1;				\
 	}
 
+#define prop_uint(a) prop_number_create_unsigned_integer(a)
+
+static int
+store_mbr(gpt_t gpt, unsigned int i, const struct mbr *mbr,
+    prop_array_t *mbr_array)
+{
+	prop_dictionary_t mbr_dict;
+	prop_number_t propnum;
+	const struct mbr_part *par = &mbr->mbr_part[i];
+	bool rc;
+
+	if (mbr->mbr_part[i].part_typ == MBR_PTYPE_UNUSED)
+		return 0;
+
+	mbr_dict = prop_dictionary_create();
+	PROP_ERR(mbr_dict);
+	propnum = prop_number_create_integer(i);
+	PROP_ERR(propnum);
+	rc = prop_dictionary_set(mbr_dict, "index", propnum);
+	PROP_ERR(rc);
+	propnum = prop_uint(par->part_flag);
+	PROP_ERR(propnum);
+	rc = prop_dictionary_set(mbr_dict, "flag", propnum);
+	PROP_ERR(rc);
+	propnum = prop_uint(par->part_shd);
+	PROP_ERR(propnum);
+	rc = prop_dictionary_set(mbr_dict, "start_head", propnum);
+	PROP_ERR(rc);
+	propnum = prop_uint(par->part_ssect);
+	PROP_ERR(propnum);
+	rc = prop_dictionary_set(mbr_dict, "start_sector", propnum);
+	PROP_ERR(rc);
+	propnum = prop_uint(par->part_scyl);
+	PROP_ERR(propnum);
+	rc = prop_dictionary_set(mbr_dict, "start_cylinder", propnum);
+	PROP_ERR(rc);
+	propnum = prop_uint(par->part_typ);
+	PROP_ERR(propnum);
+	rc = prop_dictionary_set(mbr_dict, "type", propnum);
+	PROP_ERR(rc);
+	propnum = prop_uint(par->part_ehd);
+	PROP_ERR(propnum);
+	rc = prop_dictionary_set(mbr_dict, "end_head", propnum);
+	PROP_ERR(rc);
+	propnum = prop_uint(par->part_esect);
+	PROP_ERR(propnum);
+	rc = prop_dictionary_set(mbr_dict, "end_sector", propnum);
+	PROP_ERR(rc);
+	propnum = prop_uint(par->part_ecyl);
+	PROP_ERR(propnum);
+	rc = prop_dictionary_set(mbr_dict, "end_cylinder", propnum);
+	PROP_ERR(rc);
+	propnum = prop_uint(le16toh(par->part_start_lo));
+	PROP_ERR(propnum);
+	rc = prop_dictionary_set(mbr_dict, "lba_start_low", propnum);
+	PROP_ERR(rc);
+	propnum = prop_uint(le16toh(par->part_start_hi));
+	PROP_ERR(propnum);
+	rc = prop_dictionary_set(mbr_dict, "lba_start_high", propnum);
+	PROP_ERR(rc);
+	propnum = prop_uint(le16toh(par->part_size_lo));
+	PROP_ERR(propnum);
+	rc = prop_dictionary_set(mbr_dict, "lba_size_low", propnum);
+	PROP_ERR(rc);
+	propnum = prop_uint(le16toh(par->part_size_hi));
+	PROP_ERR(propnum);
+	rc = prop_dictionary_set(mbr_dict, "lba_size_high", propnum);
+	if (*mbr_array == NULL) {
+		*mbr_array = prop_array_create();
+		PROP_ERR(*mbr_array);
+	}
+	rc = prop_array_add(*mbr_array, mbr_dict);
+	PROP_ERR(rc);
+	return 0;
+}
+
+static int
+store_gpt(gpt_t gpt, const struct gpt_hdr *hdr, prop_dictionary_t *type_dict)
+{
+	prop_number_t propnum;
+	prop_string_t propstr;
+	char buf[128];
+	bool rc;
+
+	*type_dict = prop_dictionary_create();
+	PROP_ERR(type_dict);
+	propnum = prop_uint(le32toh(hdr->hdr_revision));
+	PROP_ERR(propnum);
+	rc = prop_dictionary_set(*type_dict, "revision", propnum);
+	PROP_ERR(rc);
+	gpt_uuid_snprintf(buf, sizeof(buf), "%d", hdr->hdr_guid);
+	propstr = prop_string_create_cstring(buf);
+	PROP_ERR(propstr);
+	rc = prop_dictionary_set(*type_dict, "guid", propstr);
+	PROP_ERR(rc);
+	propnum = prop_number_create_integer(le32toh(hdr->hdr_entries));
+	PROP_ERR(propnum);
+	rc = prop_dictionary_set(*type_dict, "entries", propnum);
+	PROP_ERR(rc);
+	return 0;
+}
+
+static int
+store_tbl(gpt_t gpt, const map_t m, prop_dictionary_t *type_dict)
+{
+	const struct gpt_ent *ent;
+	unsigned int i;
+	prop_dictionary_t gpt_dict;
+	prop_array_t gpt_array;
+	prop_number_t propnum;
+	prop_string_t propstr;
+	char buf[128];
+	uint8_t utfbuf[__arraycount(ent->ent_name) * 3 + 1];
+	bool rc;
+
+	*type_dict = prop_dictionary_create();
+	PROP_ERR(*type_dict);
+
+	ent = m->map_data;
+	gpt_array = prop_array_create();
+	PROP_ERR(gpt_array);
+	for (i = 1, ent = m->map_data;
+	    (const char *)ent < (const char *)(m->map_data) +
+	    m->map_size * gpt->secsz; i++, ent++) {
+		gpt_dict = prop_dictionary_create();
+		PROP_ERR(gpt_dict);
+		propnum = prop_number_create_integer(i);
+		PROP_ERR(propnum);
+		rc = prop_dictionary_set(gpt_dict, "index", propnum);
+		PROP_ERR(propnum);
+		gpt_uuid_snprintf(buf, sizeof(buf), "%d", ent->ent_type);
+		propstr = prop_string_create_cstring(buf);
+		PROP_ERR(propstr);
+		rc = prop_dictionary_set(gpt_dict, "type", propstr);
+		gpt_uuid_snprintf(buf, sizeof(buf), "%d", ent->ent_guid);
+		propstr = prop_string_create_cstring(buf);
+		PROP_ERR(propstr);
+		rc = prop_dictionary_set(gpt_dict, "guid", propstr);
+		PROP_ERR(propstr);
+		propnum = prop_uint(le64toh(ent->ent_lba_start));
+		PROP_ERR(propnum);
+		rc = prop_dictionary_set(gpt_dict, "start", propnum);
+		PROP_ERR(rc);
+		propnum = prop_uint(le64toh(ent->ent_lba_end));
+		PROP_ERR(rc);
+		rc = prop_dictionary_set(gpt_dict, "end", propnum);
+		PROP_ERR(rc);
+		propnum = prop_uint(le64toh(ent->ent_attr));
+		PROP_ERR(propnum);
+		rc = prop_dictionary_set(gpt_dict, "attributes", propnum);
+		PROP_ERR(rc);
+		utf16_to_utf8(ent->ent_name, utfbuf, sizeof(utfbuf));
+		if (utfbuf[0] != '\0') {
+			propstr = prop_string_create_cstring((char *)utfbuf);
+			PROP_ERR(propstr);
+			rc = prop_dictionary_set(gpt_dict, "name", propstr);
+			PROP_ERR(rc);
+		}
+		rc = prop_array_add(gpt_array, gpt_dict);
+		PROP_ERR(rc);
+	}
+	rc = prop_dictionary_set(*type_dict, "gpt_array", gpt_array);
+	PROP_ERR(rc);
+	prop_object_release(gpt_array);
+	return 0;
+}
+
 static int
 backup(gpt_t gpt)
 {
 	map_t m;
 	struct mbr *mbr;
-	struct gpt_hdr *hdr;
-	struct gpt_ent *ent;
 	unsigned int i;
-	prop_dictionary_t props, mbr_dict, gpt_dict, type_dict;
-	prop_array_t mbr_array, gpt_array;
+	prop_dictionary_t props, type_dict;
+	prop_array_t mbr_array;
 	prop_data_t propdata;
 	prop_number_t propnum;
-	prop_string_t propstr;
-	char *propext, *s, buf[128];
+	char *propext;
 	bool rc;
 
 	props = prop_dictionary_create();
@@ -109,82 +273,8 @@ backup(gpt_t gpt)
 			PROP_ERR(rc);
 			mbr_array = NULL;
 			for (i = 0; i < 4; i++) {
-				if (mbr->mbr_part[i].part_typ !=
-				    MBR_PTYPE_UNUSED) {
-					mbr_dict = prop_dictionary_create();
-					PROP_ERR(mbr_dict);
-					propnum = prop_number_create_integer(i);
-					PROP_ERR(propnum);
-					rc = prop_dictionary_set(mbr_dict,
-					    "index", propnum);
-					PROP_ERR(rc);
-					propnum = prop_number_create_unsigned_integer(mbr->mbr_part[i].part_flag);
-					PROP_ERR(propnum);
-					rc = prop_dictionary_set(mbr_dict,
-					    "flag", propnum);
-					PROP_ERR(rc);
-					propnum = prop_number_create_unsigned_integer(mbr->mbr_part[i].part_shd);
-					PROP_ERR(propnum);
-					rc = prop_dictionary_set(mbr_dict,
-					    "start_head", propnum);
-					PROP_ERR(rc);
-					propnum = prop_number_create_unsigned_integer(mbr->mbr_part[i].part_ssect);
-					PROP_ERR(propnum);
-					rc = prop_dictionary_set(mbr_dict,
-					    "start_sector", propnum);
-					PROP_ERR(rc);
-					propnum = prop_number_create_unsigned_integer(mbr->mbr_part[i].part_scyl);
-					PROP_ERR(propnum);
-					rc = prop_dictionary_set(mbr_dict,
-					    "start_cylinder", propnum);
-					PROP_ERR(rc);
-					propnum = prop_number_create_unsigned_integer(mbr->mbr_part[i].part_typ);
-					PROP_ERR(propnum);
-					rc = prop_dictionary_set(mbr_dict,
-					    "type", propnum);
-					PROP_ERR(rc);
-					propnum = prop_number_create_unsigned_integer(mbr->mbr_part[i].part_ehd);
-					PROP_ERR(propnum);
-					rc = prop_dictionary_set(mbr_dict,
-					    "end_head", propnum);
-					PROP_ERR(rc);
-					propnum = prop_number_create_unsigned_integer(mbr->mbr_part[i].part_esect);
-					PROP_ERR(propnum);
-					rc = prop_dictionary_set(mbr_dict,
-					    "end_sector", propnum);
-					PROP_ERR(rc);
-					propnum = prop_number_create_unsigned_integer(mbr->mbr_part[i].part_ecyl);
-					PROP_ERR(propnum);
-					rc = prop_dictionary_set(mbr_dict,
-					    "end_cylinder", propnum);
-					PROP_ERR(rc);
-					propnum = prop_number_create_unsigned_integer(le16toh(mbr->mbr_part[i].part_start_lo));
-					PROP_ERR(propnum);
-					rc = prop_dictionary_set(mbr_dict,
-					    "lba_start_low", propnum);
-					PROP_ERR(rc);
-					propnum = prop_number_create_unsigned_integer(le16toh(mbr->mbr_part[i].part_start_hi));
-					PROP_ERR(propnum);
-					rc = prop_dictionary_set(mbr_dict,
-					    "lba_start_high", propnum);
-					PROP_ERR(rc);
-					propnum = prop_number_create_unsigned_integer(le16toh(mbr->mbr_part[i].part_size_lo));
-					PROP_ERR(propnum);
-					rc = prop_dictionary_set(mbr_dict,
-					    "lba_size_low", propnum);
-					PROP_ERR(rc);
-					propnum = prop_number_create_unsigned_integer(le16toh(mbr->mbr_part[i].part_size_hi));
-					PROP_ERR(propnum);
-					rc = prop_dictionary_set(mbr_dict,
-					    "lba_size_high", propnum);
-					if (mbr_array == NULL) {
-						mbr_array = prop_array_create();
-						PROP_ERR(mbr_array);
-					}
-					rc = prop_array_add(mbr_array,
-					    mbr_dict);
-					PROP_ERR(rc);
-				}
+				if (store_mbr(gpt, i, mbr, &mbr_array) == -1)
+					return -1;
 			}
 			if (mbr_array != NULL) {
 				rc = prop_dictionary_set(type_dict,
@@ -197,87 +287,16 @@ backup(gpt_t gpt)
 			prop_object_release(type_dict);
 			break;
 		case MAP_TYPE_PRI_GPT_HDR:
-			type_dict = prop_dictionary_create();
-			PROP_ERR(type_dict);
-			hdr = m->map_data;
-			propnum = prop_number_create_unsigned_integer(le32toh(hdr->hdr_revision));
-			PROP_ERR(propnum);
-			rc = prop_dictionary_set(type_dict, "revision",
-			    propnum);
-			PROP_ERR(rc);
-			gpt_uuid_snprintf(buf, sizeof(buf), "%d",
-			    hdr->hdr_guid);
-			propstr = prop_string_create_cstring(buf);
-			PROP_ERR(propstr);
-			rc = prop_dictionary_set(type_dict, "guid", propstr);
-			PROP_ERR(rc);
-			propnum = prop_number_create_integer(le32toh(hdr->hdr_entries));
-			PROP_ERR(propnum);
-			rc = prop_dictionary_set(type_dict, "entries", propnum);
-			PROP_ERR(rc);
+			if (store_gpt(gpt, m->map_data, &type_dict) == -1)
+				return -1;
+
 			rc = prop_dictionary_set(props, "GPT_HDR", type_dict);
 			PROP_ERR(rc);
 			prop_object_release(type_dict);
 			break;
 		case MAP_TYPE_PRI_GPT_TBL:
-			type_dict = prop_dictionary_create();
-			PROP_ERR(type_dict);
-			ent = m->map_data;
-			gpt_array = prop_array_create();
-			PROP_ERR(gpt_array);
-			for (i = 1, ent = m->map_data;
-			    (char *)ent < (char *)(m->map_data) +
-			    m->map_size * gpt->secsz; i++, ent++) {
-				gpt_dict = prop_dictionary_create();
-				PROP_ERR(gpt_dict);
-				propnum = prop_number_create_integer(i);
-				PROP_ERR(propnum);
-				rc = prop_dictionary_set(gpt_dict, "index",
-				    propnum);
-				PROP_ERR(propnum);
-				gpt_uuid_snprintf(buf, sizeof(buf), "%d",
-				    ent->ent_type);
-				propstr = prop_string_create_cstring(buf);
-				PROP_ERR(propstr);
-				rc = prop_dictionary_set(gpt_dict, "type",
-				    propstr);
-				gpt_uuid_snprintf(buf, sizeof(buf), "%d",
-				    ent->ent_guid);
-				propstr = prop_string_create_cstring(buf);
-				PROP_ERR(propstr);
-				rc = prop_dictionary_set(gpt_dict, "guid",
-				    propstr);
-				PROP_ERR(propstr);
-				propnum = prop_number_create_unsigned_integer(le64toh(ent->ent_lba_start));
-				PROP_ERR(propnum);
-				rc = prop_dictionary_set(gpt_dict, "start",
-				    propnum);
-				PROP_ERR(rc);
-				propnum = prop_number_create_unsigned_integer(le64toh(ent->ent_lba_end));
-				PROP_ERR(rc);
-				rc = prop_dictionary_set(gpt_dict, "end",
-				    propnum);
-				PROP_ERR(rc);
-				propnum = prop_number_create_unsigned_integer(le64toh(ent->ent_attr));
-				PROP_ERR(propnum);
-				rc = prop_dictionary_set(gpt_dict,
-				    "attributes", propnum);
-				PROP_ERR(rc);
-				s = (char *)utf16_to_utf8(ent->ent_name);
-				if (*s != '\0') {
-					propstr = prop_string_create_cstring(s);
-					PROP_ERR(propstr);
-					rc = prop_dictionary_set(gpt_dict,
-					    "name", propstr);
-					PROP_ERR(rc);
-				}
-				rc = prop_array_add(gpt_array, gpt_dict);
-				PROP_ERR(rc);
-			}
-			rc = prop_dictionary_set(type_dict,
-			    "gpt_array", gpt_array);
-			PROP_ERR(rc);
-			prop_object_release(gpt_array);
+			if (store_tbl(gpt, m, &type_dict) == -1)
+				return -1;
 			rc = prop_dictionary_set(props, "GPT_TBL", type_dict);
 			PROP_ERR(rc);
 			prop_object_release(type_dict);