diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1329ed2e..e0ea36d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake )
 
 ##########################################################################
 # Common and library path
-set( LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/libraries" )
+set( LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/deps" )
 
 ##########################################################################
 # Dependencies and compiler settings
@@ -31,6 +31,7 @@ configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/src/common/Version.cpp.in"
 ##########################################################################
 add_subdirectory( "deps/datReader" )
 add_subdirectory( "deps/mysqlConnector" )
+add_subdirectory( "deps/zlib" )
 add_subdirectory( "src/common" )
 
 add_subdirectory( "src/servers" )
diff --git a/deps/datReader/CMakeLists.txt b/deps/datReader/CMakeLists.txt
index 41b4b462..a8c7ec6c 100644
--- a/deps/datReader/CMakeLists.txt
+++ b/deps/datReader/CMakeLists.txt
@@ -20,7 +20,7 @@ if (UNIX)
     target_link_libraries( xivdat PUBLIC dl )
     target_link_libraries( xivdat PUBLIC z )
 else()
-    target_link_libraries( xivdat PUBLIC zlib1 )
+    target_link_libraries( xivdat PUBLIC zlib )
 endif()
 target_include_directories( xivdat PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} )
 #cotire( xivdat )
diff --git a/deps/zlib/CMakeLists.txt b/deps/zlib/CMakeLists.txt
new file mode 100644
index 00000000..b766f4c7
--- /dev/null
+++ b/deps/zlib/CMakeLists.txt
@@ -0,0 +1,50 @@
+# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+if(UNIX)
+  # Look for an installed zlib on unix
+  find_package(ZLIB REQUIRED)
+
+  add_library(zlib SHARED IMPORTED GLOBAL)
+
+  set_target_properties(zlib
+    PROPERTIES
+      IMPORTED_LOCATION
+        "${ZLIB_LIBRARIES}"
+      INTERFACE_INCLUDE_DIRECTORIES
+        "${ZLIB_INCLUDE_DIRS}")
+else()
+  # Use the bundled source on windows
+  SET(zlib_STAT_SRCS
+    adler32.c
+    compress.c
+    crc32.c
+    deflate.c
+    infback.c
+    inffast.c
+    inflate.c
+    inftrees.c
+    trees.c
+    uncompr.c
+    zutil.c
+  )
+
+  add_library(zlib STATIC
+    ${zlib_STAT_SRCS})
+
+  target_include_directories(zlib
+    PUBLIC
+      ${CMAKE_CURRENT_SOURCE_DIR})
+
+  set_target_properties(zlib
+      PROPERTIES
+        FOLDER
+          "deps")
+endif()