diff --git a/src/game/vmap/VMapDefinitions.h b/src/game/vmap/VMapDefinitions.h
index 257374209..35526b078 100644
--- a/src/game/vmap/VMapDefinitions.h
+++ b/src/game/vmap/VMapDefinitions.h
@@ -32,7 +32,7 @@
 namespace VMAP
 {
     const char VMAP_MAGIC[] = "VMAP_4.0";                       /**< used in final vmap files */
-    const char RAW_VMAP_MAGIC[] = "VMAPc06";                // used in extracted vmap files with raw data
+    const char RAW_VMAP_MAGIC[] = "VMAPp06";                // used in extracted vmap files with raw data
     const char GAMEOBJECT_MODELS[] = "temp_gameobject_models";  /**< TODO */
 
     /**
diff --git a/src/tools/Extractor_projects/shared/ExtractorCommon.h b/src/tools/Extractor_projects/shared/ExtractorCommon.h
index 8c6567be6..b44b1add7 100644
--- a/src/tools/Extractor_projects/shared/ExtractorCommon.h
+++ b/src/tools/Extractor_projects/shared/ExtractorCommon.h
@@ -42,8 +42,8 @@ bool isTransportMap(int mapID);
 bool shouldSkipMap(int mapID, bool m_skipContinents, bool m_skipJunkMaps, bool m_skipBattlegrounds);
 
 
-uint32 const Builds[] = {13164, 13205, 13287, 13329, 13596, 13623, 13914, 14007, 14333, 14480, 14545, 15005, 15050, 15211, 15354, 15595, 0};
-static uint32 CONF_TargetBuild = 15595;              // 4.3.4.15595
+uint32 const Builds[] = {13164, 13205, 13287, 13329, 13596, 13623, 13914, 14007, 14333, 14480, 14545, 15005, 15050, 15211, 15354, 15595, 15890, 16016, 16048, 16057, 16309, 16357, 16516, 16650, 16769, 16844, 16965, 0};
+static uint32 CONF_TargetBuild = 17128;              // 5.3.0.17128
 
 static char const* Locales[] = {"enGB", "enUS", "deDE", "esES", "frFR", "koKR", "zhCN", "zhTW", "enCN", "enTW", "esMX", "ruRU"};
 #define LOCALES_COUNT 12
diff --git a/src/tools/Extractor_projects/vmap-extractor/vmapexport.cpp b/src/tools/Extractor_projects/vmap-extractor/vmapexport.cpp
index 3d09c5ee3..f2d28b1f3 100644
--- a/src/tools/Extractor_projects/vmap-extractor/vmapexport.cpp
+++ b/src/tools/Extractor_projects/vmap-extractor/vmapexport.cpp
@@ -70,11 +70,11 @@ HANDLE LocaleMpq = NULL;
 char const* CONF_mpq_list[] =
 {
     "world.MPQ",
-    "art.MPQ",
+    "misc.MPQ",
     "expansion1.MPQ",
     "expansion2.MPQ",
     "expansion3.MPQ",
-    "world2.MPQ",
+    "expansion4.MPQ",
 };
 
 #define LAST_DBC_IN_DATA_BUILD 13623    // after this build mpqs with dbc are back to locale folder
@@ -109,7 +109,7 @@ uint32 CONF_max_build = 0;
 
 //static const char * szWorkDirMaps = ".\\Maps";
 const char* szWorkDirWmo = "./Buildings";
-const char* szRawVMAPMagic = "VMAPc06";
+const char* szRawVMAPMagic = "VMAPp06";
 
 
 
@@ -190,7 +190,7 @@ bool LoadLocaleMPQFile(int const locale)
     char filename[512];
 
     // first base old version of dbc files
-    sprintf(filename, "%s/Data/%s/locale-%s.MPQ", input_path, Locales[locale], Locales[locale]);
+    sprintf(filename, "%s/misc.MPQ", input_path);
 
     if (!OpenArchive(filename, &LocaleMpq))
     {
@@ -272,7 +272,7 @@ void LoadCommonMPQFiles(uint32 build)
     int count = sizeof(CONF_mpq_list) / sizeof(char*);
     for (int i = 1; i < count; ++i)
     {
-        if (build < 15211 && !strcmp("world2.MPQ", CONF_mpq_list[i]))   // 4.3.2 and higher MPQ
+        if (build < 15211 && !strcmp("misc.MPQ", CONF_mpq_list[i]))   // 4.3.2 and higher MPQ
             continue;
 
         _stprintf(filename, _T("%s/Data/%s"), input_path, CONF_mpq_list[i]);