diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a33cae2e..aa961fcb2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,6 +82,7 @@ add_subdirectory(client)
 
 file(GLOB DOCS Documentation/*.pdf)
 
+#
 if( NOT ( (DEFINED INSTALL_SYSTEM_FILES) AND ( NOT ( INSTALL_SYSTEM_FILES ) ) ) )
   install(FILES maxscale.conf DESTINATION /etc/ld.so.conf.d/ PERMISSIONS WORLD_EXECUTE WORLD_READ)
   if(DEB_BASED)
@@ -94,16 +95,11 @@ if( NOT ( (DEFINED INSTALL_SYSTEM_FILES) AND ( NOT ( INSTALL_SYSTEM_FILES ) ) )
 endif()
 
 message(STATUS "Installing MaxScale to: ${CMAKE_INSTALL_PREFIX}/")
-install(FILES server/test/MaxScale_test.cnf RENAME MaxScale.cnf DESTINATION etc)
+install(FILES server/MaxScale_template.cnf DESTINATION etc)
 install(FILES ${ERRMSG} DESTINATION mysql)
 install(FILES ${DOCS} DESTINATION Documentation)
 
-if(STATIC_EMBEDDED)
-  install(FILES ${EMBEDDED_LIB} DESTINATION lib)
-endif()
-
-
-
+#See if we are on a RPM-capable or DEB-capable system
 find_program(RPMBUILD rpmbuild)
 find_program(DEBBUILD dpkg-buildpackage)
 
diff --git a/server/core/CMakeLists.txt b/server/core/CMakeLists.txt
index 400b6fab7..45bf6f658 100644
--- a/server/core/CMakeLists.txt
+++ b/server/core/CMakeLists.txt
@@ -1,6 +1,6 @@
 file(GLOB FULLCORE_SRC *.c)
 add_library(fullcore STATIC ${FULLCORE_SRC})
-target_link_libraries(fullcore utils log_manager aio pthread crypt dl mysqld crypto inih)
+target_link_libraries(fullcore utils log_manager aio pthread crypt dl ${EMBEDDED_LIB} crypto inih z)
 
 add_executable(maxscale atomic.c buffer.c spinlock.c gateway.c
 	gw_utils.c utils.c dcb.c load_utils.c session.c service.c server.c 
diff --git a/server/core/test/CMakeLists.txt b/server/core/test/CMakeLists.txt
index 8e0f54661..f21d14bf6 100644
--- a/server/core/test/CMakeLists.txt
+++ b/server/core/test/CMakeLists.txt
@@ -5,7 +5,7 @@ add_executable(test_adminusers testadminusers.c)
 target_link_libraries(test_hash crypto ssl pthread log_manager fullcore)
 target_link_libraries(test_spinlock crypto ssl pthread log_manager fullcore)
 target_link_libraries(test_filter crypto ssl pthread log_manager fullcore)
-target_link_libraries(test_adminusers crypto crypt mysqld ssl fullcore)
+target_link_libraries(test_adminusers crypto crypt ${EMBEDDED_LIB} ssl fullcore)
 add_test(TestHash test_hash)
 add_test(TestSpinlock test_spinlock)
 add_test(TestFilter test_filter)
diff --git a/server/modules/monitor/CMakeLists.txt b/server/modules/monitor/CMakeLists.txt
index 9f2322b75..918ca0c85 100644
--- a/server/modules/monitor/CMakeLists.txt
+++ b/server/modules/monitor/CMakeLists.txt
@@ -1,11 +1,11 @@
 add_library(mysqlmon SHARED mysql_mon.c)
-target_link_libraries(mysqlmon utils log_manager mysqld)
+target_link_libraries(mysqlmon utils log_manager ${EMBEDDED_LIB})
 install(TARGETS mysqlmon DESTINATION modules)
 
 add_library(galeramon SHARED galera_mon.c)
-target_link_libraries(galeramon utils log_manager mysqld)
+target_link_libraries(galeramon utils log_manager ${EMBEDDED_LIB})
 install(TARGETS galeramon DESTINATION modules)
 
 add_library(ndbclustermon SHARED ndbcluster_mon.c)
-target_link_libraries(ndbclustermon utils log_manager mysqld)
+target_link_libraries(ndbclustermon utils log_manager ${EMBEDDED_LIB})
 install(TARGETS ndbclustermon DESTINATION modules)
\ No newline at end of file
diff --git a/server/modules/routing/binlog/CMakeLists.txt b/server/modules/routing/binlog/CMakeLists.txt
index a36324eb1..071901b70 100644
--- a/server/modules/routing/binlog/CMakeLists.txt
+++ b/server/modules/routing/binlog/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_library(binlogrouter SHARED blr.c blr_master.c blr_cache.c blr_slave.c blr_file.c)
 set_target_properties(binlogrouter PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_RPATH}:${CMAKE_INSTALL_PREFIX}/lib)
-target_link_libraries(binlogrouter ssl pthread log_manager mysqld)
+target_link_libraries(binlogrouter ssl pthread log_manager ${EMBEDDED_LIB})
 install(TARGETS binlogrouter DESTINATION modules)
diff --git a/server/modules/routing/readwritesplit/CMakeLists.txt b/server/modules/routing/readwritesplit/CMakeLists.txt
index 2d079fbd7..42ea0d7fa 100644
--- a/server/modules/routing/readwritesplit/CMakeLists.txt
+++ b/server/modules/routing/readwritesplit/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_library(readwritesplit SHARED readwritesplit.c)
-target_link_libraries(readwritesplit utils ssl pthread log_manager query_classifier mysqld)
+target_link_libraries(readwritesplit utils ssl pthread log_manager query_classifier ${EMBEDDED_LIB})
 install(TARGETS readwritesplit DESTINATION modules)
 if(BUILD_TESTS)
 add_subdirectory(test)