diff --git a/ChangeLog.txt b/ChangeLog.txt
index 23ff380a..56405764 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,12 @@
+o Version 2.11 (2016.09.??)
+    Do not download BIOS related files unless BIOS boot is selected
+    Improve support for Arch Linux derivatives
+    Add a cheat mode to disable drive indexing (Alt-Q) on format
+    Fix handling of 'Super Floppy Disk' formatted drives
+    Fix an issue that enabled FAT32 file system selection on some Windows images
+    Fix broken UI font for XP users
+    Fix sanitizing of exFAT labels
+
 o Version 2.10 (2016.07.20)
     Add SHA-256 validation for downloaded files. You will now see an ✓ or ✗ in the log for relevant content
     Add support for O2Micro PCI-E card readers
diff --git a/src/drive.c b/src/drive.c
index 14da117d..8909d50e 100644
--- a/src/drive.c
+++ b/src/drive.c
@@ -728,7 +728,7 @@ BOOL GetDrivePartitionData(DWORD DriveIndex, char* FileSystemName, DWORD FileSys
 		// Detect drives that are using the whole disk as a single partition
 		if ((DriveLayout->PartitionEntry[0].Mbr.PartitionType != PARTITION_ENTRY_UNUSED) &&
 			(DriveLayout->PartitionEntry[0].StartingOffset.QuadPart == 0LL)) {
-			suprintf("Partition type: BFD (Big Floppy Disk)");
+			suprintf("Partition type: SFD (Super Floppy Disk) or Unpartitioned");
 			big_floppy = TRUE;
 		} else {
 			suprintf("Partition type: MBR, NB Partitions: %d\n", SelectedDrive.nPartitions);
diff --git a/src/format.c b/src/format.c
index 219572fb..f36fca61 100644
--- a/src/format.c
+++ b/src/format.c
@@ -733,7 +733,7 @@ static BOOL FormatDrive(DWORD DriveIndex)
 	}
 	GetWindowTextW(hLabel, wLabel, ARRAYSIZE(wLabel));
 	// Make sure the label is valid
-	ToValidLabel(wLabel, (wFSType[0] == 'F') && (wFSType[1] == 'A') && (wFSType[2] == 'T'));
+	ToValidLabel(wLabel, (fs == FS_FAT16) || (fs == FS_FAT32) || (fs == FS_EXFAT));
 	ulClusterSize = (ULONG)ComboBox_GetItemData(hClusterSize, ComboBox_GetCurSel(hClusterSize));
 	if (ulClusterSize < 0x200) {
 		// 0 is FormatEx's value for default, which we need to use for UDF
diff --git a/src/rufus.rc b/src/rufus.rc
index 0eebcedb..4e01fe6f 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 242, 376
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 2.11.992"
+CAPTION "Rufus 2.11.993"
 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -320,8 +320,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,11,992,0
- PRODUCTVERSION 2,11,992,0
+ FILEVERSION 2,11,993,0
+ PRODUCTVERSION 2,11,993,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -338,13 +338,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "2.11.992"
+            VALUE "FileVersion", "2.11.993"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2016 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "2.11.992"
+            VALUE "ProductVersion", "2.11.993"
         END
     END
     BLOCK "VarFileInfo"