Index: uspace/app/mkfat/mkfat.c
===================================================================
--- uspace/app/mkfat/mkfat.c	(revision 08232eec7477aa13695d471714768b19b5d6d270)
+++ uspace/app/mkfat/mkfat.c	(revision 92454138de3db76b779e4a3ddf80182cb677196d)
@@ -77,4 +77,6 @@
 } fat_params_t;
 
+static void syntax_print(void);
+
 static int fat_params_compute(struct fat_cfg const *cfg,
     struct fat_params *par);
@@ -100,5 +102,6 @@
 
 	if (argc < 2) {
-		printf(NAME ": Bad syntax.\n");
+		printf(NAME ": Error, argument missing.\n");
+		syntax_print();
 		return 1;
 	}
@@ -109,5 +112,6 @@
 		--argc; ++argv;
 		if (*argv == NULL) {
-			printf(NAME ": Bad syntax.\n");
+			printf(NAME ": Error, argument missing.\n");
+			syntax_print();
 			return 1;
 		}
@@ -115,5 +119,6 @@
 		cfg.total_sectors = strtol(*argv, &endptr, 10);
 		if (*endptr != '\0') {
-			printf(NAME ": Bad syntax.\n");
+			printf(NAME ": Error, invalid argument.\n");
+			syntax_print();
 			return 1;
 		}
@@ -123,5 +128,6 @@
 
 	if (argc != 1) {
-		printf(NAME ": Bad syntax.\n");
+		printf(NAME ": Error, unexpected argument.\n");
+		syntax_print();
 		return 1;
 	}
@@ -131,5 +137,5 @@
 	rc = devmap_device_get_handle(dev_path, &handle, 0);
 	if (rc != EOK) {
-		printf(NAME ": Error resolving device `%s'.\n", argv[1]);
+		printf(NAME ": Error resolving device `%s'.\n", dev_path);
 		return 2;
 	}
@@ -183,4 +189,9 @@
 
 	return 0;
+}
+
+static void syntax_print(void)
+{
+	printf("syntax: mkfat [--size <num_blocks>] <device_name>\n");
 }