diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9f5634e45..426c48c08 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,6 +23,13 @@ find_package(MySQLClient)
 find_package(MySQL)
 find_package(Pandoc)
 
+# You can find the variables set by this in the FindCURL.cmake file
+# which is a default module in CMake.
+find_package(CURL) 
+if(NOT CURL_FOUND)
+  message(FATAL_ERROR "Failed to locate dependency: libcurl")
+endif()
+
 set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH}:${CMAKE_INSTALL_PREFIX}/lib:${CMAKE_INSTALL_PREFIX}/modules)
 
 # Make sure the release notes for this release are present if it is a stable one
@@ -109,6 +116,7 @@ include_directories(server/include)
 include_directories(server/inih)
 include_directories(server/modules/include)
 include_directories(${CMAKE_BINARY_DIR}/server/include)
+include_directories(${CURL_INCLUDE_DIRS})
 
 add_subdirectory(utils)
 add_subdirectory(log_manager)
diff --git a/server/core/CMakeLists.txt b/server/core/CMakeLists.txt
index b60999901..5a4ab13b8 100644
--- a/server/core/CMakeLists.txt
+++ b/server/core/CMakeLists.txt
@@ -8,7 +8,7 @@ add_executable(maxscale atomic.c buffer.c spinlock.c gateway.c
 	poll.c config.c users.c hashtable.c dbusers.c thread.c gwbitmask.c 
 	monitor.c adminusers.c secrets.c filter.c modutil.c hint.c
 	housekeeper.c memlog.c)
-target_link_libraries(maxscale ${EMBEDDED_LIB} log_manager utils ssl aio pthread crypt dl crypto inih z rt m stdc++)
+target_link_libraries(maxscale ${EMBEDDED_LIB} ${CURL_LIBRARIES} log_manager utils ssl aio pthread crypt dl crypto inih z rt m stdc++ )
 install(TARGETS maxscale DESTINATION bin)
 
 add_executable(maxkeys maxkeys.c secrets.c utils.c)