diff --git a/ChangeLog.txt b/ChangeLog.txt
index f589715c..6405a1b7 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,7 +1,7 @@
 o Version 3.2 (2018.09.??)
     Add RSA-2048 signature validation on all the server downloads
     Add "Fast zeroing" cheat mode (courtesy of René van der Zee)
-    Add support for XP/Server 2003 x64 ISOs (courtesy of Mattiwatti) 
+    Add support for XP/Server 2003 x64 ISOs (courtesy of Mattiwatti)
     Improve ISO extraction performance by preallocating files (courtesy of Mattiwatti)
     Improve bad blocks check algorithm (from suggestions by AL.Skywalker)
     Fix progress not being displayed for Sylinux or GRUB downloads
@@ -47,7 +47,7 @@ o Version 2.17 (2017.09.12)
     Fix an issue with Windows To Go support on some non-official Windows ISOs
     Fix an issue with log autoscrolling
     Fix an issue when using A: or B: as drive letters
- 
+
 o Version 2.16 (2017.07.31)
     Add an audiovisual cue on completion/error
     Add a workaround for ISOs using nonstandard Rock Ridge extensions (looking at you Kali Linux!)
@@ -200,7 +200,7 @@ o Version 2.1 (2015.03.23)
 o Version 2.0 (2015.03.03)
     Major UI improvements (improved font, new info field, no separate progress dialog, etc.)
     Add support for Windows To Go (if Rufus is running on Windows 8 or later)
-    Add support for Grub4DOS and GRUB 2 based images (e.g. FreeNAS) 
+    Add support for Grub4DOS and GRUB 2 based images (e.g. FreeNAS)
     Add portable application support, through a 'rufus.ini' file
     Add native decompression support for DD images (.Z, .gz, .lzma, .bz2 and .xz)
     Add seamless UEFI boot of NTFS partitions, for Windows ISOs with large files (>4GB)
@@ -287,7 +287,7 @@ o Version 1.4.4 (2014.02.26)
     Ignore failure on ISO autorun.inf creation, to keep dumb security applications happy
     Improve hotplug detection
     Improve Syslinux v5+ support (requires an internet connection to download extra files)
-    Fix support for latest gparted, ArchLinux, and other Syslinux v5+ based ISOs 
+    Fix support for latest gparted, ArchLinux, and other Syslinux v5+ based ISOs
     Fix detection for Toshiba drives (again)
     Fix UDF Unicode support
 
diff --git a/src/rufus.c b/src/rufus.c
index 4aac6ee5..369d0e80 100644
--- a/src/rufus.c
+++ b/src/rufus.c
@@ -156,13 +156,16 @@ static void SetAllowedFileSystems(void)
 		allowed_filesystem[FS_FAT32] = TRUE;
 		break;
 	case BT_IMAGE:
+		allowed_filesystem[FS_NTFS] = TRUE;
+		// Don't allow anything besides NTFS if the image has a >4GB file
+		if ((image_path != NULL) && (img_report.has_4GB_file))
+			break;
 		if (!HAS_WINDOWS(img_report) || (tt != TT_BIOS) || allow_dual_uefi_bios) {
 			if (!HAS_WINTOGO(img_report) || (ComboBox_GetCurSel(GetDlgItem(hMainDialog, IDC_IMAGE_OPTION)) != 1)) {
 				allowed_filesystem[FS_FAT16] = TRUE;
 				allowed_filesystem[FS_FAT32] = TRUE;
 			}
 		}
-		allowed_filesystem[FS_NTFS] = TRUE;
 		break;
 	case BT_SYSLINUX_V6:
 		allowed_filesystem[FS_NTFS] = TRUE;
diff --git a/src/rufus.rc b/src/rufus.rc
index c4618b01..4d237ac2 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 232, 326
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 3.2.1394"
+CAPTION "Rufus 3.2.1395"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -392,8 +392,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,2,1394,0
- PRODUCTVERSION 3,2,1394,0
+ FILEVERSION 3,2,1395,0
+ PRODUCTVERSION 3,2,1395,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -411,13 +411,13 @@ BEGIN
             VALUE "Comments", "https://akeo.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.2.1394"
+            VALUE "FileVersion", "3.2.1395"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus-3.2.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.2.1394"
+            VALUE "ProductVersion", "3.2.1395"
         END
     END
     BLOCK "VarFileInfo"