diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
index c122df09..6d3df9a0 100644
--- a/cmake/FindMySQL.cmake
+++ b/cmake/FindMySQL.cmake
@@ -4,201 +4,61 @@
 
 # This module defines
 # MYSQL_INCLUDE_DIR, where to find mysql.h
-# MYSQL_LIBRARIES, the libraries to link against to connect to MySQL
-# MYSQL_FOUND, if false, you cannot build anything that requires MySQL.
+# MYSQL_LIBRARY, the libraries needed to use MySQL.
+# MYSQL_FOUND, If false, do not try to use MySQL.
 
-# also defined, but not for general use are
-# MYSQL_LIBRARY, where to find the MySQL library.
+if(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY)
+  set(MYSQL_FOUND TRUE)
+else(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY)
 
-set( MYSQL_FOUND 0 )
+  SET(PROGRAM_FILES_ARCH_PATH)
+  if(PLATFORM EQUAL 32)
+    SET(PROGRAM_FILES_ARCH_PATH $ENV{ProgramFiles})
+  elseif(PLATFORM EQUAL 64)
+    SET(PROGRAM_FILES_ARCH_PATH $ENV{ProgramW6432})
+  endif()
 
-if( UNIX )
-  set(MYSQL_CONFIG_PREFER_PATH "$ENV{MYSQL_HOME}/bin" CACHE FILEPATH
-    "preferred path to MySQL (mysql_config)"
-  )
+  if (${PROGRAM_FILES_ARCH_PATH})
+    STRING(REPLACE "\\\\" "/" PROGRAM_FILES_ARCH_PATH ${PROGRAM_FILES_ARCH_PATH})
+  endif(${PROGRAM_FILES_ARCH_PATH})
 
-  find_program(MYSQL_CONFIG mysql_config
-    ${MYSQL_CONFIG_PREFER_PATH}
-    /usr/local/mysql/bin/
-    /usr/local/bin/
-    /usr/bin/
-  )
-
-  if( MYSQL_CONFIG )
-    message(STATUS "Using mysql-config: ${MYSQL_CONFIG}")
-    # set INCLUDE_DIR
-    exec_program(${MYSQL_CONFIG}
-      ARGS --include
-      OUTPUT_VARIABLE MY_TMP
-    )
-
-    string(REGEX REPLACE "-I([^ ]*)( .*)?" "\\1" MY_TMP "${MY_TMP}")
-    set(MYSQL_ADD_INCLUDE_PATH ${MY_TMP} CACHE FILEPATH INTERNAL)
-    #message("[DEBUG] MYSQL ADD_INCLUDE_PATH : ${MYSQL_ADD_INCLUDE_PATH}")
-    # set LIBRARY_DIR
-    exec_program(${MYSQL_CONFIG}
-      ARGS --libs_r
-      OUTPUT_VARIABLE MY_TMP
-    )
-    set(MYSQL_ADD_LIBRARIES "")
-    string(REGEX MATCHALL "-l[^ ]*" MYSQL_LIB_LIST "${MY_TMP}")
-    foreach(LIB ${MYSQL_LIB_LIST})
-      string(REGEX REPLACE "[ ]*-l([^ ]*)" "\\1" LIB "${LIB}")
-      list(APPEND MYSQL_ADD_LIBRARIES "${LIB}")
-      #message("[DEBUG] MYSQL ADD_LIBRARIES : ${MYSQL_ADD_LIBRARIES}")
-    endforeach(LIB ${MYSQL_LIB_LIST})
-
-    set(MYSQL_ADD_LIBRARIES_PATH "")
-    string(REGEX MATCHALL "-L[^ ]*" MYSQL_LIBDIR_LIST "${MY_TMP}")
-    foreach(LIB ${MYSQL_LIBDIR_LIST})
-      string(REGEX REPLACE "[ ]*-L([^ ]*)" "\\1" LIB "${LIB}")
-      list(APPEND MYSQL_ADD_LIBRARIES_PATH "${LIB}")
-      #message("[DEBUG] MYSQL ADD_LIBRARIES_PATH : ${MYSQL_ADD_LIBRARIES_PATH}")
-    endforeach(LIB ${MYSQL_LIBS})
-
-  else( MYSQL_CONFIG )
-    set(MYSQL_ADD_LIBRARIES "")
-    list(APPEND MYSQL_ADD_LIBRARIES "mysqlclient_r")
-  endif( MYSQL_CONFIG )
-endif( UNIX )
-
-find_path(MYSQL_INCLUDE_DIR
-  NAMES
-    mysql.h
-  PATHS
-    ${MYSQL_ADD_INCLUDE_PATH}
-    /usr/include
+  find_path(MYSQL_INCLUDE_DIR mysql.h
     /usr/include/mysql
-    /usr/local/include
     /usr/local/include/mysql
     /usr/local/mysql/include
-    "C:/Program Files/MySQL/MySQL Server 5.6/include"
-    "C:/Program Files/MySQL/MySQL Server 5.5/include"
-    "C:/Program Files/MySQL/MySQL Server 5.1/include"
-    "C:/Program Files/MySQL/MySQL Server 5.0/include"
-    "C:/Program Files/MySQL/include"
-    "C:/Program Files (x86)/MySQL/MySQL Server 5.6/include"
-    "C:/Program Files (x86)/MySQL/MySQL Server 5.5/include"
-    "C:/Program Files (x86)/MySQL/MySQL Server 5.1/include"
-    "C:/Program Files (x86)/MySQL/MySQL Server 5.0/include"
-    "C:/Program Files (x86)/MySQL/include"
-    "C:/MySQL/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.5;Location]/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.0;Location]/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.6;Location]/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.5;Location]/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;Location]/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.0;Location]/include"
-    "$ENV{ProgramFiles}/MySQL/*/include"
-    "$ENV{SystemDrive}/MySQL/*/include"
-    "c:/msys/local/include"
-    "$ENV{MYSQL_ROOT}/include"
-  DOC
-    "Specify the directory containing mysql.h."
-)
+    /opt/local/include/mysql*/mysql
+    ${PROGRAM_FILES_ARCH_PATH}/MySQL/MYSQLS~1.6/include
+  )
 
-if( UNIX )
-  foreach(LIB ${MYSQL_ADD_LIBRARIES})
-    find_library( MYSQL_LIBRARY
+  if(WIN32 AND MSVC)
+    find_library(MYSQL_LIBRARY
       NAMES
-        mysql libmysql ${LIB}
+        libmysql
+      PATHS
+        ${PROGRAM_FILES_ARCH_PATH}/MySQL/MYSQLS~1.6/lib
+      )
+  else(WIN32 AND MSVC)
+    find_library(MYSQL_LIBRARY
+      NAMES
+        mysql 
+        libmysql
       PATHS
-        ${MYSQL_ADD_LIBRARIES_PATH}
-        /usr/lib
         /usr/lib/mysql
-        /usr/local/lib
         /usr/local/lib/mysql
         /usr/local/mysql/lib
-      DOC "Specify the location of the mysql library here."
-    )
-  endforeach(LIB ${MYSQL_ADD_LIBRARY})
-endif( UNIX )
+        /opt/local/lib/mysql*/mysql
+      )
+  endif(WIN32 AND MSVC)
 
-if( WIN32 )
-  find_path( MYSQL_LIBRARY_DIR
-    NAMES
-      libmysql.lib
-    PATHS
-      ${MYSQL_ADD_LIBRARIES_PATH}
-      "C:/Program Files/MySQL/MySQL Server 5.6/lib"
-      "C:/Program Files/MySQL/MySQL Server 5.6/lib/opt"
-      "C:/Program Files/MySQL/MySQL Server 5.5/lib"
-      "C:/Program Files/MySQL/MySQL Server 5.5/lib/opt"
-      "C:/Program Files/MySQL/MySQL Server 5.1/lib"
-      "C:/Program Files/MySQL/MySQL Server 5.1/lib/opt"
-      "C:/Program Files/MySQL/MySQL Server 5.0/lib"
-      "C:/Program Files/MySQL/MySQL Server 5.0/lib/opt"
-      "C:/Program Files/MySQL/lib"
-      "C:/Program Files (x86)/MySQL/MySQL Server 5.6/lib"
-      "C:/Program Files (x86)/MySQL/MySQL Server 5.6/lib/opt"
-      "C:/Program Files (x86)/MySQL/MySQL Server 5.5/lib"
-      "C:/Program Files (x86)/MySQL/MySQL Server 5.5/lib/opt"
-      "C:/Program Files (x86)/MySQL/MySQL Server 5.1/lib"
-      "C:/Program Files (x86)/MySQL/MySQL Server 5.1/lib/opt"
-      "C:/Program Files (x86)/MySQL/MySQL Server 5.0/lib"
-      "C:/Program Files (x86)/MySQL/MySQL Server 5.0/lib/opt"
-      "C:/Program Files (x86)/MySQL/lib"
-      "C:/MySQL/lib/debug"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/lib"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/lib/opt"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.5;Location]/lib"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.5;Location]/lib/opt"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/lib"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/lib/opt"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.0;Location]/lib"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.0;Location]/lib/opt"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.6;Location]/lib"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.6;Location]/lib/opt"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.5;Location]/lib"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.5;Location]/lib/opt"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;Location]/lib"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;Location]/lib/opt"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.0;Location]/lib"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.0;Location]/lib/opt"
-      "$ENV{ProgramFiles}/MySQL/*/lib/opt"
-      "$ENV{SystemDrive}/MySQL/*/lib/opt"
-      "c:/msys/local/include"
-      "$ENV{MYSQL_ROOT}/lib"
-    DOC "Specify the path to the mysql library (.lib) here."
-)
-find_library( MYSQL_LIBRARY
-    NAMES
-      libmysql
-    PATHS
-      "${MYSQL_LIBRARY_DIR}"
-    DOC "Specify the location of the mysql library here."
-)
-endif( WIN32 )
-
-# On Windows you typically don't need to include any extra libraries
-# to build MYSQL stuff.
-
-if( NOT WIN32 )
-  find_library( MYSQL_EXTRA_LIBRARIES
-    NAMES
-      z zlib
-    PATHS
-      /usr/lib
-      /usr/local/lib
-    DOC
-      "if more libraries are necessary to link in a MySQL client (typically zlib), specify them here."
-  )
-else( NOT WIN32 )
-  set( MYSQL_EXTRA_LIBRARIES "" )
-endif( NOT WIN32 )
-
-if( MYSQL_LIBRARY )
-  if( MYSQL_INCLUDE_DIR )
-    set( MYSQL_FOUND 1 )
-    message(STATUS "Found MySQL library path: ${MYSQL_LIBRARY_DIR}")
+  if(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY)
+    set(MYSQL_FOUND TRUE)
     message(STATUS "Found MySQL library: ${MYSQL_LIBRARY}")
     message(STATUS "Found MySQL headers: ${MYSQL_INCLUDE_DIR}")
-  else( MYSQL_INCLUDE_DIR )
-    message(FATAL_ERROR "Could not find MySQL headers! Please install the development libraries and headers")
-  endif( MYSQL_INCLUDE_DIR )
-  mark_as_advanced( MYSQL_FOUND MYSQL_LIBRARY MYSQL_EXTRA_LIBRARIES MYSQL_INCLUDE_DIR )
-else( MYSQL_LIBRARY )
-  message(FATAL_ERROR "Could not find the MySQL libraries! Please install the development libraries and headers")
-endif( MYSQL_LIBRARY )
\ No newline at end of file
+  else(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY)
+    set(MYSQL_FOUND FALSE)
+    message(FATAL_ERROR "Could not find ${PLATFORM}-bit MySQL headers or libraries! Please install the development libraries and headers.")
+  endif(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY)
+
+  mark_as_advanced(MYSQL_INCLUDE_DIR MYSQL_LIBRARY)
+
+endif(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY)
\ No newline at end of file
diff --git a/src/mangosd/CMakeLists.txt b/src/mangosd/CMakeLists.txt
index ed85e392..5fe5ad4a 100644
--- a/src/mangosd/CMakeLists.txt
+++ b/src/mangosd/CMakeLists.txt
@@ -168,12 +168,12 @@ if(WIN32)
     if(MSVC)
         add_custom_command(TARGET ${EXECUTABLE_NAME}
             POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy "${MYSQL_LIBRARY_DIR}/libmysql.dll" "${CMAKE_BINARY_DIR}/bin/$(Configuration)/"
+            COMMAND ${CMAKE_COMMAND} -E copy "${MYSQL_LIBRARY}" "${CMAKE_BINARY_DIR}/bin/$(Configuration)/"
         )
     elseif(XCODE)
         add_custom_command(TARGET ${EXECUTABLE_NAME}
             POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy "${MYSQL_LIBRARY_DIR}/libmysql.dll" "${CMAKE_BINARY_DIR}/bin/"
+            COMMAND ${CMAKE_COMMAND} -E copy "${MYSQL_LIBRARY}" "${CMAKE_BINARY_DIR}/bin/"
         )
     endif()
 endif()