diff --git a/src/iso.c b/src/iso.c
index 86a72d61..ae835465 100644
--- a/src/iso.c
+++ b/src/iso.c
@@ -91,6 +91,7 @@ static const char* pe_file[] = { "ntdetect.com", "setupldr.bin", "txtsetup.sif"
 static const char* reactos_name = "setupldr.sys"; // TODO: freeldr.sys doesn't seem to work
 static const char* kolibri_name = "kolibri.img";
 static const char* autorun_name = "autorun.inf";
+static const char* manjaro_marker = ".miso";
 static const char* stupid_antivirus = "  NOTE: This is usually caused by a poorly designed security solution. "
 	"See https://goo.gl/QTobxX.\r\n  This file will be skipped for now, but you should really "
 	"look into using a *SMARTER* antivirus solution.";
@@ -201,6 +202,9 @@ static BOOL check_iso_props(const char* psz_dirname, int64_t file_length, const
 			if (safe_stricmp(psz_basename, bootmgr_efi_name) == 0) {
 				img_report.has_efi |= 1;
 			}
+			if (safe_stricmp(psz_basename, manjaro_marker) == 0) {
+				img_report.disable_iso = TRUE;
+			}
 		}
 
 		// Check for ReactOS' setupldr.sys anywhere
diff --git a/src/rufus.c b/src/rufus.c
index 29a0de9d..4c63db8a 100755
--- a/src/rufus.c
+++ b/src/rufus.c
@@ -1103,8 +1103,9 @@ DWORD WINAPI ISOScanThread(LPVOID param)
 	if (img_report.is_iso) {
 		DisplayISOProps();
 		// If we have an ISOHybrid, but without an ISO method we support, disable ISO support altogether
-		if (IS_DD_BOOTABLE(img_report) && !IS_BIOS_BOOTABLE(img_report) && !IS_EFI_BOOTABLE(img_report)) {
-			uprintf("This ISOHybrid is not compatible with any of the ISO boot methods we support");
+		if (IS_DD_BOOTABLE(img_report) && (img_report.disable_iso ||
+				(!IS_BIOS_BOOTABLE(img_report) && !IS_EFI_BOOTABLE(img_report)))) {
+			uprintf("Note: ISO mode will be disabled because this ISOHybrid is not compatible with ISO boot.");
 			img_report.is_iso = FALSE;
 		}
 		selection_default = BT_IMAGE;
diff --git a/src/rufus.h b/src/rufus.h
index 7113645d..2525b448 100644
--- a/src/rufus.h
+++ b/src/rufus.h
@@ -341,6 +341,7 @@ typedef struct {
 	BOOLEAN uses_minint;
 	BOOLEAN compression_type;
 	BOOLEAN is_vhd;
+	BOOLEAN disable_iso;
 	uint16_t sl_version;	// Syslinux/Isolinux version
 	char sl_version_str[12];
 	char sl_version_ext[32];
diff --git a/src/rufus.rc b/src/rufus.rc
index 05997b63..a6706190 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.6.1543"
+CAPTION "Rufus 3.6.1544"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -394,8 +394,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,1543,0
- PRODUCTVERSION 3,6,1543,0
+ FILEVERSION 3,6,1544,0
+ PRODUCTVERSION 3,6,1544,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -413,13 +413,13 @@ BEGIN
             VALUE "Comments", "https://akeo.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.6.1543"
+            VALUE "FileVersion", "3.6.1544"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2019 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus-3.6.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.6.1543"
+            VALUE "ProductVersion", "3.6.1544"
         END
     END
     BLOCK "VarFileInfo"