Index: uspace/app/fdisk/fdisk.c
===================================================================
--- uspace/app/fdisk/fdisk.c	(revision 89e2aac331337c511818ea5fcfec2682e9fa2c71)
+++ uspace/app/fdisk/fdisk.c	(revision e7c4115de0a5bf1dd17b4e273352cc4607d67e03)
@@ -520,5 +520,5 @@
 		/* Ask for volume label */
 		printf("Enter volume label for new partition.\n");
-		rc = tinput_read_i(tinput, "No name", &label);
+		rc = tinput_read_i(tinput, "New volume", &label);
 		if (rc != EOK)
 			goto error;
Index: uspace/app/mkexfat/exfat.h
===================================================================
--- uspace/app/mkexfat/exfat.h	(revision 89e2aac331337c511818ea5fcfec2682e9fa2c71)
+++ uspace/app/mkexfat/exfat.h	(revision e7c4115de0a5bf1dd17b4e273352cc4607d67e03)
@@ -37,4 +37,5 @@
 #define EXFAT_FILENAME_LEN	255
 #define EXFAT_NAME_PART_LEN	15
+#define EXFAT_VOLLABEL_LEN	11
 
 #define EXFAT_TYPE_UNUSED	0x00
Index: uspace/app/mkexfat/mkexfat.c
===================================================================
--- uspace/app/mkexfat/mkexfat.c	(revision 89e2aac331337c511818ea5fcfec2682e9fa2c71)
+++ uspace/app/mkexfat/mkexfat.c	(revision e7c4115de0a5bf1dd17b4e273352cc4607d67e03)
@@ -101,6 +101,6 @@
 	size_t   sector_size;
 	size_t   cluster_size;
+	const char *label;
 } exfat_cfg_t;
-
 
 static unsigned log2(unsigned n);
@@ -126,4 +126,5 @@
 	{"cluster-size", required_argument, 0, 'c'},
 	{"fs-size", required_argument, 0, 's'},
+	{"label", required_argument, 0, 'L' },
 };
 
@@ -132,5 +133,6 @@
 	printf("Usage: mkexfat [options] <device>\n"
 	    "-c, --cluster-size ## Specify the cluster size (Kb)\n"
-	    "-s, --fs-size ##      Specify the filesystem size (sectors)\n");
+	    "-s, --fs-size ##      Specify the filesystem size (sectors)\n"
+	    "    --label ##        Volume label\n");
 }
 
@@ -597,4 +599,5 @@
 	exfat_dentry_t *d;
 	aoff64_t rootdir_sec;
+	uint16_t wlabel[EXFAT_VOLLABEL_LEN + 1];
 	int rc;
 	uint8_t *data;
@@ -608,9 +611,22 @@
 
 	/* Initialize the volume label dentry */
-	d->type = EXFAT_TYPE_VOLLABEL;
-	str_to_utf16(d->vollabel.label, 8, "HELENOS ");
-	d->vollabel.size = 8;
-
-	d++;
+
+	if (cfg->label != NULL) {
+		memset(wlabel, 0, (EXFAT_VOLLABEL_LEN + 1) * sizeof(uint16_t));
+		rc = str_to_utf16(wlabel, EXFAT_VOLLABEL_LEN + 1, cfg->label);
+		if (rc != EOK) {
+			rc = EINVAL;
+			goto exit;
+		}
+
+		d->type = EXFAT_TYPE_VOLLABEL;
+		memcpy(d->vollabel.label, wlabel, EXFAT_VOLLABEL_LEN * 2);
+		d->vollabel.size = utf16_wsize(wlabel);
+		assert(d->vollabel.size <= EXFAT_VOLLABEL_LEN);
+
+		d++;
+	} else {
+		d->type = EXFAT_TYPE_VOLLABEL & ~EXFAT_TYPE_USED;
+	}
 
 	/* Initialize the allocation bitmap dentry */
@@ -751,7 +767,8 @@
 
 	cfg.cluster_size = 0;
+	cfg.label = NULL;
 
 	for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
-		c = getopt_long(argc, argv, "hs:c:",
+		c = getopt_long(argc, argv, "hs:c:L:",
 		    long_options, &opt_ind);
 		switch (c) {
@@ -781,4 +798,7 @@
 			}
 			break;
+		case 'L':
+			cfg.label = optarg;
+			break;
 		}
 	}