diff --git a/Utilities/bin_patch.cpp b/Utilities/bin_patch.cpp
index 989e3a3b40..730a7336cb 100644
--- a/Utilities/bin_patch.cpp
+++ b/Utilities/bin_patch.cpp
@@ -151,9 +151,10 @@ bool patch_engine::load(patch_map& patches_map, const std::string& path, bool im
 		if (is_legacy_patch)
 		{
 			struct patch_info info{};
-			info.hash      = main_key;
-			info.enabled   = enable_legacy_patches;
-			info.is_legacy = true;
+			info.hash        = main_key;
+			info.enabled     = enable_legacy_patches;
+			info.is_legacy   = true;
+			info.source_path = path;
 
 			if (!read_patch_node(info, pair.second, root, log_messages))
 			{
@@ -224,6 +225,7 @@ bool patch_engine::load(patch_map& patches_map, const std::string& path, bool im
 				info.description = description;
 				info.hash        = main_key;
 				info.version     = version;
+				info.source_path = path;
 
 				if (const auto title_node = patches_entry.second["Game Title"])
 				{
@@ -258,6 +260,25 @@ bool patch_engine::load(patch_map& patches_map, const std::string& path, bool im
 					}
 				}
 
+				// Skip this patch if a higher patch version already exists
+				if (container.patch_info_map.find(description) != container.patch_info_map.end())
+				{
+					bool ok;
+					const auto existing_version  = container.patch_info_map[description].patch_version;
+					const bool version_is_bigger = utils::compare_versions(info.patch_version, existing_version, ok) > 0;
+
+					if (!ok || !version_is_bigger)
+					{
+						patch_log.warning("A higher or equal patch version already exists ('%s' vs '%s') for %s: %s (in file %s)", info.patch_version, existing_version, main_key, description, path);
+						append_log_message(log_messages, fmt::format("A higher or equal patch version already exists ('%s' vs '%s') for %s: %s (in file %s)", info.patch_version, existing_version, main_key, description, path));
+						continue;
+					}
+					else if (!importing)
+					{
+						patch_log.warning("A lower patch version was found ('%s' vs '%s') for %s: %s (in file %s)", existing_version, info.patch_version, main_key, description,  container.patch_info_map[description].source_path);
+					}
+				}
+
 				// Insert patch information
 				container.patch_info_map[description] = info;
 			}
@@ -685,6 +706,7 @@ static bool append_patches(patch_engine::patch_map& existing_patches, const patc
 			if (!new_info.author.empty())        info.author        = new_info.author;
 			if (!new_info.notes.empty())         info.notes         = new_info.notes;
 			if (!new_info.data_list.empty())     info.data_list     = new_info.data_list;
+			if (!new_info.source_path.empty())   info.source_path   = new_info.source_path;
 		}
 	}
 
diff --git a/Utilities/bin_patch.h b/Utilities/bin_patch.h
index b5d6a958c4..3a2956be06 100644
--- a/Utilities/bin_patch.h
+++ b/Utilities/bin_patch.h
@@ -49,6 +49,7 @@ public:
 		std::string patch_version;
 		std::string author;
 		std::string notes;
+		std::string source_path;
 		bool enabled = false;
 
 		// Redundant information for accessibility (see patch_container)
diff --git a/Utilities/version.cpp b/Utilities/version.cpp
index d067b7feef..67c8b07453 100644
--- a/Utilities/version.cpp
+++ b/Utilities/version.cpp
@@ -67,7 +67,7 @@ namespace utils
 		int vnum2 = 0;
 
 		// Loop until both strings are processed
-		for (int i = 0, j = 0; (i < v1.length() || j < v2.length());)
+		for (size_t i = 0, j = 0; (i < v1.length() || j < v2.length());)
 		{
 			// Storing numeric part of version 1 in vnum1
 			while (i < v1.length() && v1[i] != '.')