Index: uspace/app/fdisk/fdisk.c
===================================================================
--- uspace/app/fdisk/fdisk.c	(revision 852664b9efd94a3f59595e0ce9fb3cf053be39e1)
+++ uspace/app/fdisk/fdisk.c	(revision 21f154330a64e36a4c6b45d4de538b0a581c0c6b)
@@ -419,4 +419,5 @@
 	fdisk_part_info_t pinfo;
 	char *scap = NULL;
+	char *spkind = NULL;
 	char *sfstype = NULL;
 	char *sdesc = NULL;
@@ -452,14 +453,29 @@
 		}
 
-		rc = fdisk_fstype_format(pinfo.fstype, &sfstype);
-		if (rc != EOK) {
-			printf("Out of memory.\n");
-			goto error;
-		}
-
-		rc = asprintf(&sdesc, "%s, %s", scap, sfstype);
-		if (rc < 0) {
-			rc = ENOMEM;
-			goto error;
+		rc = fdisk_pkind_format(pinfo.pkind, &spkind);
+		if (rc != EOK) {
+			printf("\nOut of memory.\n");
+			goto error;
+		}
+
+		if (pinfo.pkind != lpk_extended) {
+			rc = fdisk_fstype_format(pinfo.fstype, &sfstype);
+			if (rc != EOK) {
+				printf("Out of memory.\n");
+				goto error;
+			}
+
+			rc = asprintf(&sdesc, "%s, %s, %s", scap, spkind, sfstype);
+			if (rc < 0) {
+				rc = ENOMEM;
+				goto error;
+			}
+
+		} else {
+			rc = asprintf(&sdesc, "%s, %s", scap, spkind);
+			if (rc < 0) {
+				rc = ENOMEM;
+				goto error;
+			}
 		}
 
@@ -473,4 +489,6 @@
 		free(scap);
 		scap = NULL;
+		free(spkind);
+		spkind = NULL;
 		free(sfstype);
 		sfstype = NULL;
@@ -481,4 +499,11 @@
 	}
 
+	rc = nchoice_add(choice, "Cancel", NULL, 0);
+	if (rc != EOK) {
+		assert(rc == ENOMEM);
+		printf("Out of memory.\n");
+		goto error;
+	}
+
 	rc = nchoice_get(choice, &sel);
 	if (rc != EOK) {
@@ -487,8 +512,10 @@
 	}
 
-	rc = fdisk_part_destroy((fdisk_part_t *)sel);
-	if (rc != EOK) {
-		printf("Error deleting partition.\n");
-		return rc;
+	if (sel != NULL) {
+		rc = fdisk_part_destroy((fdisk_part_t *)sel);
+		if (rc != EOK) {
+			printf("Error deleting partition.\n");
+			return rc;
+		}
 	}
 
@@ -497,4 +524,5 @@
 error:
 	free(scap);
+	free(spkind);
 	free(sfstype);
 	free(sdesc);