Index: uspace/app/mkexfat/mkexfat.c
===================================================================
--- uspace/app/mkexfat/mkexfat.c	(revision cbd8a72030dda5fe02b01e9f2d94abaa48668452)
+++ uspace/app/mkexfat/mkexfat.c	(revision a69e3961957dc521f07d9576bdb1ab2d90d3b50a)
@@ -148,4 +148,5 @@
 	cfg->bitmap_size = n_req_clusters / 8;
 
+	/* Compute the number of clusters reserved to the bitmap */
 	cfg->allocated_clusters = div_round_up(cfg->bitmap_size,
 	    cfg->cluster_size);
@@ -153,5 +154,8 @@
 	/* This account for the root directory */
 	cfg->allocated_clusters++;
-	/* FIXME: add upcase table clusters to allocated_clusters */
+
+	/* Compute the number of clusters reserved to the upcase table */
+	cfg->allocated_clusters += div_round_up(sizeof(upcase_table),
+	    cfg->cluster_size);
 
 	/* FIXME: set the real rootdir cluster */