diff --git a/src/game/Server/SharedDefines.h b/src/game/Server/SharedDefines.h
index 8c5534dd4..7c262570e 100644
--- a/src/game/Server/SharedDefines.h
+++ b/src/game/Server/SharedDefines.h
@@ -4177,7 +4177,7 @@ enum TrackedAuraType
 // others will not and opposite
 // will only support WoW, WoW:TBC, WoW:WotLK , WoW:Cataclysm and WoW:MOP 5.3.0 client build 17538...
 
-#define EXPECTED_MANGOSD_CLIENT_BUILD        {17538, 0}
+#define EXPECTED_MANGOSD_CLIENT_BUILD        {18273, 0}
 
 // max supported expansion level in mangosd
 // NOTE: not set it more that supported by targeted client version with all expansions installed
diff --git a/src/game/WorldHandlers/World.cpp b/src/game/WorldHandlers/World.cpp
index 844fe6d5c..f100f3136 100644
--- a/src/game/WorldHandlers/World.cpp
+++ b/src/game/WorldHandlers/World.cpp
@@ -1695,7 +1695,7 @@ void World::showFooter()
         modules_.insert("                Warden : Disabled");
     }
 
-    std::string thisClientVersion ("17538");
+    std::string thisClientVersion ("18273");
     std::string thisClientBuilds = AcceptableClientBuildsListStr();
 
     std::string sModules;
diff --git a/src/tools/Extractor_projects/map-extractor/System.cpp b/src/tools/Extractor_projects/map-extractor/System.cpp
index ced1f8dd5..c9dc5d110 100644
--- a/src/tools/Extractor_projects/map-extractor/System.cpp
+++ b/src/tools/Extractor_projects/map-extractor/System.cpp
@@ -1188,7 +1188,7 @@ void ExtractMapsFromMpq(uint32 build, const int locale)
     printf("\nExtracting maps...\n");
     if (build==17520)
 	{
-		build = 17538;
+		build = 18273;
 	}
 
     uint32 map_count = ReadMapDBC(locale);
@@ -1525,7 +1525,7 @@ int main(int argc, char* arg[])
                 build = ReadBuild(FirstLocale);
                 if (build==17520)
                 {
-                    build = 17538;
+                    build = 18273;
                 }
                 printf("Detected client build: %u\n", build);
                 break;
@@ -1538,7 +1538,7 @@ int main(int argc, char* arg[])
                 build = ReadBuild(FirstLocale);
                 if (build==17520)
                 {
-                    build = 17538;
+                    build = 18273;
                 }
                 printf("Detected client build: %u\n", build);
                 ExtractDBCFiles(i, true);
diff --git a/src/tools/Extractor_projects/shared/ExtractorCommon.h b/src/tools/Extractor_projects/shared/ExtractorCommon.h
index c7b469f16..34f09e124 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, 15890, 16016, 16048, 16057, 16309, 16357, 16516, 16650, 16769, 16844, 16965, 17538, 0};
-static uint32 CONF_TargetBuild = 17538;              // 5.4.1.17538
+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, 17538, 18273, 0};
+static uint32 CONF_TargetBuild = 18273;              // 5.4.8.18273
 
 static char const* Locales[] = {"enGB", "enUS", "deDE", "esES", "frFR", "koKR", "zhCN", "zhTW", "enCN", "enTW", "esMX", "ruRU"};
 #define LOCALES_COUNT 12