diff --git a/src/rufus.c b/src/rufus.c
index 767ae697..65199eca 100644
--- a/src/rufus.c
+++ b/src/rufus.c
@@ -268,11 +268,11 @@ static BOOL DefineClusterSizes(void)
 		if (nWindowsVersion > WINDOWS_XP) {
 			SelectedDrive.ClusterSize[FS_EXFAT].Allowed = 0x03FFFE00;
 			if (SelectedDrive.DiskSize < 256*MB)	// < 256 MB
-				SelectedDrive.ClusterSize[FS_EXFAT].Default = 4*1024;
+				SelectedDrive.ClusterSize[FS_EXFAT].Default = 4*KB;
 			else if (SelectedDrive.DiskSize < 32*GB)	// < 32 GB
-				SelectedDrive.ClusterSize[FS_EXFAT].Default = 32*1024;
+				SelectedDrive.ClusterSize[FS_EXFAT].Default = 32*KB;
 			else
-				SelectedDrive.ClusterSize[FS_EXFAT].Default = 28*1024;
+				SelectedDrive.ClusterSize[FS_EXFAT].Default = 128*KB;
 		}
 
 		// UDF (only supported for Vista and later)
diff --git a/src/rufus.rc b/src/rufus.rc
index 78023b18..e9cd6b45 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.9.894"
+CAPTION "Rufus 2.9.895"
 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,9,894,0
- PRODUCTVERSION 2,9,894,0
+ FILEVERSION 2,9,895,0
+ PRODUCTVERSION 2,9,895,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.9.894"
+            VALUE "FileVersion", "2.9.895"
             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.9.894"
+            VALUE "ProductVersion", "2.9.895"
         END
     END
     BLOCK "VarFileInfo"