diff --git a/contrib/extractor/CMakeLists.txt b/contrib/extractor/CMakeLists.txt
index 023359612..f4d20994f 100644
--- a/contrib/extractor/CMakeLists.txt
+++ b/contrib/extractor/CMakeLists.txt
@@ -11,20 +11,12 @@
 cmake_minimum_required (VERSION 2.6)
 project (MANGOS_MAP_EXTRACTOR)
 
-message(FATAL_ERROR
-  "This project CMakeLists.txt outdated after switch use dep/libmpq and need update use existed Visual Studio projects for build."
-)
-
-add_subdirectory (libmpq)
 add_subdirectory (loadlib)
 
-include_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/libmpq)
 include_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/loadlib)
 
-link_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/libmpq)
 link_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/loadlib)
 
-add_executable (ad dbcfile.cpp mpq_libmpq.cpp System.cpp)
+add_executable (ad dbcfile.cpp System.cpp)
 
-target_link_libraries (ad libmpq)
-target_link_libraries (ad loadlib)
+target_link_libraries (ad loadlib libStormLib)
diff --git a/dep/CMakeLists.txt b/dep/CMakeLists.txt
index 5ac947767..eb9247981 100644
--- a/dep/CMakeLists.txt
+++ b/dep/CMakeLists.txt
@@ -26,3 +26,4 @@ endif()
 
 add_subdirectory(recastnavigation)
 add_subdirectory(src)
+add_subdirectory(StormLib)
\ No newline at end of file
diff --git a/dep/StormLib/CMakeLists.txt b/dep/StormLib/CMakeLists.txt
index e4bd1b16f..ce19e672d 100644
--- a/dep/StormLib/CMakeLists.txt
+++ b/dep/StormLib/CMakeLists.txt
@@ -300,6 +300,5 @@ if(WIN32)
     set_target_properties(storm PROPERTIES OUTPUT_NAME StormLib)
 endif()
 
-install(TARGETS storm RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib FRAMEWORK DESTINATION /Library/Frameworks)
-install(FILES src/StormLib.h src/StormPort.h DESTINATION include)
-
+install(TARGETS storm RUNTIME DESTINATION ${LIB_INSTALL_DIR} LIBRARY DESTINATION ${LIB_INSTALL_DIR} ARCHIVE DESTINATION ${LIB_INSTALL_DIR} FRAMEWORK DESTINATION /Library/Frameworks)
+install(FILES src/StormLib.h src/StormPort.h DESTINATION ${INCLUDE_INSTALL_DIR})
\ No newline at end of file
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index ad6bf9d9b..a5a2c0faf 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "0054"
+ #define REVISION_NR "0055"
 #endif // __REVISION_NR_H__