diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
index 42fb7833..034e94d7 100644
--- a/cmake/FindMySQL.cmake
+++ b/cmake/FindMySQL.cmake
@@ -60,6 +60,7 @@ if( UNIX )
   else( MYSQL_CONFIG )
     set(MYSQL_ADD_LIBRARIES "")
     list(APPEND MYSQL_ADD_LIBRARIES "mysqlclient_r")
+    list(APPEND MYSQL_ADD_LIBRARIES "mariadbclient")
   endif( MYSQL_CONFIG )
 endif( UNIX )
 
@@ -76,6 +77,7 @@ find_path(MYSQL_INCLUDE_DIR
   PATHS
     ${MYSQL_ADD_INCLUDE_PATH}
     /usr/include
+    /usr/include/mariadb
     /usr/include/mysql
     /usr/local/include
     /usr/local/include/mysql
@@ -97,7 +99,7 @@ if( UNIX )
   foreach(LIB ${MYSQL_ADD_LIBRARIES})
     find_library( MYSQL_LIBRARY
       NAMES
-        mysql libmysql ${LIB}
+        mysql libmysql libmariadb ${LIB}
       PATHS
         ${MYSQL_ADD_LIBRARIES_PATH}
         /usr/lib
@@ -105,6 +107,7 @@ if( UNIX )
         /usr/local/lib
         /usr/local/lib/mysql
         /usr/local/mysql/lib
+        /usr/lib/x86_64-linux-gnu
       DOC "Specify the location of the mysql library here."
     )
   endforeach(LIB ${MYSQL_ADD_LIBRARY})
diff --git a/src/tools/action_parse/CMakeLists.txt b/src/tools/action_parse/CMakeLists.txt
index 6ba0bc47..3b135e7e 100644
--- a/src/tools/action_parse/CMakeLists.txt
+++ b/src/tools/action_parse/CMakeLists.txt
@@ -8,7 +8,7 @@ file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 add_executable( action_parse ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
 
 if (UNIX)
-  target_link_libraries( action_parse common xivdat pthread mysqlclient dl z stdc++fs )
+  target_link_libraries( action_parse common xivdat pthread mysql dl z stdc++fs )
 else()
   target_link_libraries( action_parse common xivdat mysql zlib)
 endif()
diff --git a/src/tools/discovery_parser/CMakeLists.txt b/src/tools/discovery_parser/CMakeLists.txt
index d60766f3..e753a267 100644
--- a/src/tools/discovery_parser/CMakeLists.txt
+++ b/src/tools/discovery_parser/CMakeLists.txt
@@ -24,7 +24,7 @@ add_executable(discovery_parser ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_F
 #)
 
 if (UNIX)
-    target_link_libraries (discovery_parser common xivdat pthread mysqlclient dl z stdc++fs)
+    target_link_libraries (discovery_parser common xivdat pthread mysql dl z stdc++fs)
 else()
     target_link_libraries (discovery_parser common xivdat mysql zlib)
 endif()
diff --git a/src/tools/event_object_parser/CMakeLists.txt b/src/tools/event_object_parser/CMakeLists.txt
index 2b18f34e..dafed30a 100644
--- a/src/tools/event_object_parser/CMakeLists.txt
+++ b/src/tools/event_object_parser/CMakeLists.txt
@@ -10,7 +10,7 @@ add_executable(event_object_parser ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURC
 
 
 if (UNIX)
-    target_link_libraries (event_object_parser common xivdat pthread mysqlclient dl z stdc++fs)
+    target_link_libraries (event_object_parser common xivdat pthread mysql dl z stdc++fs)
 else()
     target_link_libraries (event_object_parser common xivdat mysql zlib)
 endif()
diff --git a/src/tools/exd_common_gen/CMakeLists.txt b/src/tools/exd_common_gen/CMakeLists.txt
index 5ad726b2..3590162b 100644
--- a/src/tools/exd_common_gen/CMakeLists.txt
+++ b/src/tools/exd_common_gen/CMakeLists.txt
@@ -8,7 +8,7 @@ file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 add_executable(exd_common_gen ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
 
 if (UNIX)
-    target_link_libraries (exd_common_gen common xivdat pthread mysqlclient dl z stdc++fs)
+    target_link_libraries (exd_common_gen common xivdat pthread mysql dl z stdc++fs)
 else()
     target_link_libraries (exd_common_gen common xivdat mysql zlib)
 endif()
diff --git a/src/tools/exd_struct_gen/CMakeLists.txt b/src/tools/exd_struct_gen/CMakeLists.txt
index 348aa164..24fa972d 100644
--- a/src/tools/exd_struct_gen/CMakeLists.txt
+++ b/src/tools/exd_struct_gen/CMakeLists.txt
@@ -8,7 +8,7 @@ file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 add_executable(exd_struct_gen ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
 
 if (UNIX)
-  target_link_libraries (exd_struct_gen common xivdat pthread mysqlclient dl z stdc++fs)
+  target_link_libraries (exd_struct_gen common xivdat pthread mysql dl z stdc++fs)
 else()
   target_link_libraries (exd_struct_gen common xivdat mysql zlib)
 endif()
diff --git a/src/tools/exd_struct_test/CMakeLists.txt b/src/tools/exd_struct_test/CMakeLists.txt
index 8ebb7bba..70c259c3 100644
--- a/src/tools/exd_struct_test/CMakeLists.txt
+++ b/src/tools/exd_struct_test/CMakeLists.txt
@@ -8,7 +8,7 @@ file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 add_executable(exd_struct_test ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
 
 if (UNIX)
-  target_link_libraries (exd_struct_test common xivdat pthread mysqlclient dl z stdc++fs )
+  target_link_libraries (exd_struct_test common xivdat pthread mysql dl z stdc++fs )
 else()
   target_link_libraries (exd_struct_test common xivdat mysql zlib)
 endif()
diff --git a/src/tools/mob_parse/CMakeLists.txt b/src/tools/mob_parse/CMakeLists.txt
index cbae9ce3..502b19eb 100644
--- a/src/tools/mob_parse/CMakeLists.txt
+++ b/src/tools/mob_parse/CMakeLists.txt
@@ -8,7 +8,7 @@ file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 add_executable(mob_parse ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
 
 if (UNIX)
-    target_link_libraries (mob_parse common xivdat pthread mysqlclient dl z stdc++fs )
+    target_link_libraries (mob_parse common xivdat pthread mysql dl z stdc++fs )
 else()
     target_link_libraries (mob_parse common xivdat mysql zlib)
 endif()
diff --git a/src/tools/nav_export/CMakeLists.txt b/src/tools/nav_export/CMakeLists.txt
index 4aaaa4c7..61fa93a8 100644
--- a/src/tools/nav_export/CMakeLists.txt
+++ b/src/tools/nav_export/CMakeLists.txt
@@ -11,7 +11,7 @@ file(GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
 add_executable( nav_export ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
 
 if (UNIX)
-    target_link_libraries( nav_export common xivdat pthread mysqlclient dl z stdc++fs Recast Detour DetourTileCache )
+    target_link_libraries( nav_export common xivdat pthread mysql dl z stdc++fs Recast Detour DetourTileCache )
 else()
     target_link_libraries( nav_export common xivdat mysql zlib Recast Detour DetourTileCache )
 endif()
diff --git a/src/tools/pcb_reader/CMakeLists.txt b/src/tools/pcb_reader/CMakeLists.txt
index d42aa873..a731a7da 100644
--- a/src/tools/pcb_reader/CMakeLists.txt
+++ b/src/tools/pcb_reader/CMakeLists.txt
@@ -11,7 +11,7 @@ file(GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
 add_executable(pcb_reader2 ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
 
 if (UNIX)
-    target_link_libraries( pcb_reader2 common xivdat pthread mysqlclient dl z stdc++fs Recast Detour DetourTileCache )
+    target_link_libraries( pcb_reader2 common xivdat pthread mysql dl z stdc++fs Recast Detour DetourTileCache )
 else()
     target_link_libraries( pcb_reader2 common xivdat mysql zlib Recast Detour DetourTileCache )
 endif()
diff --git a/src/tools/quest_parser/CMakeLists.txt b/src/tools/quest_parser/CMakeLists.txt
index 252cee64..dbd5edf3 100644
--- a/src/tools/quest_parser/CMakeLists.txt
+++ b/src/tools/quest_parser/CMakeLists.txt
@@ -8,7 +8,7 @@ file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 add_executable(quest_parse ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
 
 if (UNIX)
-  target_link_libraries (quest_parse common xivdat pthread mysqlclient dl z stdc++fs)
+  target_link_libraries (quest_parse common xivdat pthread mysql dl z stdc++fs)
 else()
   target_link_libraries (quest_parse common xivdat mysql zlib)
 endif()
diff --git a/src/tools/questbattle_bruteforce/CMakeLists.txt b/src/tools/questbattle_bruteforce/CMakeLists.txt
index 9c974d15..b4bbb22d 100644
--- a/src/tools/questbattle_bruteforce/CMakeLists.txt
+++ b/src/tools/questbattle_bruteforce/CMakeLists.txt
@@ -8,7 +8,7 @@ file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 add_executable(questbattle_bruteforce ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
 
 if (UNIX)
-  target_link_libraries (questbattle_bruteforce common xivdat pthread mysqlclient dl z stdc++fs )
+  target_link_libraries (questbattle_bruteforce common xivdat pthread mysql dl z stdc++fs )
 else()
   target_link_libraries (questbattle_bruteforce common xivdat mysql zlib)
 endif()