diff --git a/src/resource.h b/src/resource.h
index 66250c7b..e00da9fc 100644
--- a/src/resource.h
+++ b/src/resource.h
@@ -48,7 +48,7 @@
 #define IDC_DEVICE                      1001
 #define IDC_FILESYSTEM                  1002
 #define IDC_START                       1003
-#define IDC_CAPACITY                    1004
+#define IDC_PARTITION                   1004
 #define IDC_CLUSTERSIZE                 1005
 #define IDC_STATUS                      1006
 #define IDC_ABOUT                       1007
diff --git a/src/rufus.c b/src/rufus.c
index e3ad72eb..a6af777e 100644
--- a/src/rufus.c
+++ b/src/rufus.c
@@ -101,7 +101,7 @@ char szFolderPath[MAX_PATH], app_dir[MAX_PATH];
 char* iso_path = NULL;
 float fScale = 1.0f;
 int default_fs;
-HWND hDeviceList, hCapacity, hFileSystem, hClusterSize, hLabel, hDOSType, hNBPasses, hLog = NULL;
+HWND hDeviceList, hPartition, hFileSystem, hClusterSize, hLabel, hDOSType, hNBPasses, hLog = NULL;
 HWND hISOProgressDlg = NULL, hLogDlg = NULL, hISOProgressBar, hISOFileName, hDiskID;
 BOOL use_own_c32[NB_OLD_C32] = {FALSE, FALSE}, detect_fakes = TRUE, mbr_selected_by_user = FALSE;
 BOOL iso_op_in_progress = FALSE, format_op_in_progress = FALSE;
@@ -405,7 +405,7 @@ static BOOL GetDriveInfo(void)
 			}
 			uprintf("Partition type: MBR, NB Partitions: %d\n", nb_partitions);
 			tmp[sizeof(tmp)-1] = 0;
-			CreateTooltip(hCapacity, tmp, -1);
+			CreateTooltip(hPartition, tmp, -1);
 			break;
 		case PARTITION_STYLE_GPT:
 			uprintf("Partition type: GPT, NB Partitions: %d\n", DriveLayout->PartitionCount);
@@ -533,7 +533,7 @@ static BOOL PopulateProperties(int ComboIndex)
 	char no_label[] = STR_NO_LABEL;
 	int i, fs;
 
-	IGNORE_RETVAL(ComboBox_ResetContent(hCapacity));
+	IGNORE_RETVAL(ComboBox_ResetContent(hPartition));
 	IGNORE_RETVAL(ComboBox_ResetContent(hFileSystem));
 	IGNORE_RETVAL(ComboBox_ResetContent(hClusterSize));
 	EnableWindow(GetDlgItem(hMainDialog, IDC_START), FALSE);
@@ -554,12 +554,12 @@ static BOOL PopulateProperties(int ComboIndex)
 	for (i=1; i<ARRAYSIZE(suffix); i++) {
 		HumanReadableSize /= 1024.0;
 		if (HumanReadableSize < 512.0) {
-			safe_sprintf(capacity, sizeof(capacity), "%0.2f %s", HumanReadableSize, suffix[i]);
+			safe_sprintf(capacity, sizeof(capacity), "MBR (1 Partition of %0.2f %s)", HumanReadableSize, suffix[i]);
 			break;
 		}
 	}
-	IGNORE_RETVAL(ComboBox_AddStringU(hCapacity, capacity));
-	IGNORE_RETVAL(ComboBox_SetCurSel(hCapacity, 0));
+	IGNORE_RETVAL(ComboBox_AddStringU(hPartition, capacity));
+	IGNORE_RETVAL(ComboBox_SetCurSel(hPartition, 0));
 	CreateTooltip(hDeviceList, DriveID.Table[ComboIndex], -1);
 
 	// Set a proposed label according to the size (eg: "256MB", "8GB")
@@ -1072,7 +1072,7 @@ static void EnableControls(BOOL bEnable)
 	int fs;
 
 	EnableWindow(GetDlgItem(hMainDialog, IDC_DEVICE), bEnable);
-	EnableWindow(GetDlgItem(hMainDialog, IDC_CAPACITY), bEnable);
+	EnableWindow(GetDlgItem(hMainDialog, IDC_PARTITION), bEnable);
 	EnableWindow(GetDlgItem(hMainDialog, IDC_FILESYSTEM), bEnable);
 	EnableWindow(GetDlgItem(hMainDialog, IDC_CLUSTERSIZE), bEnable);
 	EnableWindow(GetDlgItem(hMainDialog, IDC_LABEL), bEnable);
@@ -1404,7 +1404,7 @@ void InitDialog(HWND hDlg)
 	// Quite a burden to carry around as parameters
 	hMainDialog = hDlg;
 	hDeviceList = GetDlgItem(hDlg, IDC_DEVICE);
-	hCapacity = GetDlgItem(hDlg, IDC_CAPACITY);
+	hPartition = GetDlgItem(hDlg, IDC_PARTITION);
 	hFileSystem = GetDlgItem(hDlg, IDC_FILESYSTEM);
 	hClusterSize = GetDlgItem(hDlg, IDC_CLUSTERSIZE);
 	hLabel = GetDlgItem(hDlg, IDC_LABEL);
diff --git a/src/rufus.rc b/src/rufus.rc
index 56014bb5..65621586 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -30,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 206, 316
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_APPWINDOW
-CAPTION "Rufus v1.3.0.218"
+CAPTION "Rufus v1.3.0.219"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "Start",IDC_START,94,278,50,14
@@ -39,8 +39,8 @@ BEGIN
     CONTROL         "Device",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,9,6,22,8
     COMBOBOX        IDC_FILESYSTEM,8,75,190,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "File system",IDC_STATIC,9,64,51,10
-    COMBOBOX        IDC_CAPACITY,8,46,190,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Capacity",IDC_STATIC,9,35,29,8
+    COMBOBOX        IDC_PARTITION,8,46,190,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Partition Scheme",IDC_STATIC,9,35,75,8
     COMBOBOX        IDC_CLUSTERSIZE,8,104,190,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Cluster size",IDC_STATIC,9,93,105,10
     PUSHBUTTON      "About...",IDC_ABOUT,8,278,50,14
@@ -274,8 +274,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0,218
- PRODUCTVERSION 1,3,0,218
+ FILEVERSION 1,3,0,219
+ PRODUCTVERSION 1,3,0,219
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -292,13 +292,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "1.3.0.218"
+            VALUE "FileVersion", "1.3.0.219"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "(c) 2011-2012 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "1.3.0.218"
+            VALUE "ProductVersion", "1.3.0.219"
         END
     END
     BLOCK "VarFileInfo"