diff -ru util-linux-2.12pre/mount/fstab.5 util-linux-2.12premod/mount/fstab.5
--- util-linux-2.12pre/mount/fstab.5	2002-11-01 02:00:50.000000000 +0100
+++ util-linux-2.12premod/mount/fstab.5	2004-02-06 19:50:42.885725968 +0100
@@ -77,15 +77,18 @@
 For procfs, use `proc'.
 .LP
 Instead of giving the device explicitly, one may indicate
-the (ext2 or xfs) filesystem that is to be mounted by its UUID or
+the (ext2, vfat or xfs) filesystem that is to be mounted by its UUID or
 volume label (cf.
-.BR e2label (8)
+.BR e2label (8),
+.BR fatlabel (8)
 or
 .BR xfs_admin (8)),
 writing LABEL=<label> or UUID=<uuid>,
 e.g., `LABEL=Boot' or `UUID=3e6be9de\%-8139\%-11d1\%-9106\%-a43f08d823a6'.
 This will make the system more robust: adding or removing a SCSI disk
 changes the disk device name but not the filesystem volume label.
+If the name of the LABEL contains spaces these can be escaped as `\\040'.
+Because vfat uuid is only 4 bytes, you have to complete the 16 bytes uuid with 0.
 
 The second field,
 .RI ( fs_file ),
diff -ru util-linux-2.12pre/mount/get_label_uuid.c util-linux-2.12premod/mount/get_label_uuid.c
--- util-linux-2.12pre/mount/get_label_uuid.c	2002-11-26 12:18:01.000000000 +0100
+++ util-linux-2.12premod/mount/get_label_uuid.c	2004-02-06 19:08:26.833264544 +0100
@@ -50,6 +50,7 @@
 	int rv = 1;
 	size_t namesize;
 	struct ext2_super_block e2sb;
+	struct fat_super_block fatsb;
 	struct xfs_super_block xfsb;
 	struct jfs_super_block jfssb;
 	struct ocfs_volume_header ovh;	/* Oracle */
@@ -75,6 +76,38 @@
 		rv = 0;
 	}
 	else if (lseek(fd, 0, SEEK_SET) == 0
+		&& read(fd, (char *) &fatsb, sizeof(fatsb)) == sizeof(fatsb)) {
+
+		char *fatuid,*fatlabel = NULL;
+		if (!strncmp(fatsb.s_fs, "FAT12   ", 8) ||
+                    !strncmp(fatsb.s_fs, "FAT16   ", 8)) {
+			fatuid = fatsb.s_uuid;
+			fatlabel = fatsb.s_label;
+		}
+		else if (!strncmp(fatsb.s_fs2, "FAT32   ", 8)) {
+			fatuid = fatsb.s_uuid2;
+			fatlabel = fatsb.s_label2;
+		}
+		
+		if (fatlabel != NULL && 
+		    fatlabel[0] != 0 && fatlabel[0] != ' ' ) {
+
+			uuid[0] = fatuid [3];
+			uuid[1] = fatuid [2];
+			uuid[2] = fatuid [1];
+			uuid[3] = fatuid [0];
+			memset(uuid+4, 0, 12);
+			//remove ending space
+			for (namesize=10;namesize>0;namesize--) 
+				if (fatsb.s_label[namesize] != ' ')
+					break;
+			namesize+=1;
+			if ((*label = calloc(namesize + 1, 1)) != NULL)
+				memcpy(*label, fatsb.s_label, namesize);
+			rv = 0;
+		}
+	}
+	else if (lseek(fd, 0, SEEK_SET) == 0
 	    && read(fd, (char *) &xfsb, sizeof(xfsb)) == sizeof(xfsb)
 	    && (strncmp(xfsb.s_magic, XFS_SUPER_MAGIC, 4) == 0)) {
 		memcpy(uuid, xfsb.s_uuid, sizeof(xfsb.s_uuid));
diff -ru util-linux-2.12pre/mount/linux_fs.h util-linux-2.12premod/mount/linux_fs.h
--- util-linux-2.12pre/mount/linux_fs.h	2003-07-05 22:16:32.000000000 +0200
+++ util-linux-2.12premod/mount/linux_fs.h	2004-02-06 15:44:08.000000000 +0100
@@ -122,11 +122,13 @@
     u_char    s_dummy[3];
     u_char    s_os[8];		/* "MSDOS5.0" or "MSWIN4.0" or "MSWIN4.1" */
 				/* mtools-3.9.4 writes "MTOOL394" */
-    u_char    s_dummy2[32];
+    u_char    s_dummy2[28];
+    u_char    s_uuid[4];
     u_char    s_label[11];	/* for DOS? */
     u_char    s_fs[8];		/* "FAT12   " or "FAT16   " or all zero   */
                                 /* OS/2 BM has "FAT     " here. */
-    u_char    s_dummy3[9];
+    u_char    s_dummy3[5];
+    u_char    s_uuid2[4];
     u_char    s_label2[11];	/* for Windows? */
     u_char    s_fs2[8];	        /* garbage or "FAT32   " */
 };