diff --git a/contrib/extractor/System.cpp b/contrib/extractor/System.cpp
index 090fc557e..ade687260 100644
--- a/contrib/extractor/System.cpp
+++ b/contrib/extractor/System.cpp
@@ -273,7 +273,9 @@ void LoadMPQFiles(int const locale)
     //need those files only if extract maps
     if(extract & EXTRACT_MAP)
     {
-        sprintf(filename,"%s/Data/common.MPQ",input_path);
+        sprintf(filename,"%s/Data/common-2.MPQ",input_path);
+        new MPQArchive(filename);
+        sprintf(filename,"%s/Data/lichking.MPQ",input_path);
         new MPQArchive(filename);
         sprintf(filename,"%s/Data/expansion.MPQ",input_path);
         new MPQArchive(filename);
diff --git a/contrib/extractor/adt.cpp b/contrib/extractor/adt.cpp
index c6cb5dba0..1c1373874 100644
--- a/contrib/extractor/adt.cpp
+++ b/contrib/extractor/adt.cpp
@@ -419,7 +419,7 @@ void TransformData()
     delete mcells;
 }
 
-const char MAP_MAGIC[] = "MAP_2.00";
+const char MAP_MAGIC[] = "MAP_2.01";
 
 bool ConvertADT(char * filename,char * filename2)
 {
@@ -441,7 +441,7 @@ bool ConvertADT(char * filename,char * filename2)
     {
         for(unsigned int y=0;y<16;y++)
         {
-            if(mcells->ch[y][x].area_id && mcells->ch[y][x].area_id < 0x102D)
+            if(mcells->ch[y][x].area_id && mcells->ch[y][x].area_id < 0x121F)
             {
                 if(areas[mcells->ch[y][x].area_id]==0xffff)
                     printf("\nCan't find area flag for areaid %u.\n",mcells->ch[y][x].area_id);