diff --git a/apps/mosquitto_ctrl/CMakeLists.txt b/apps/mosquitto_ctrl/CMakeLists.txt
index 581676ba..d4466fe5 100644
--- a/apps/mosquitto_ctrl/CMakeLists.txt
+++ b/apps/mosquitto_ctrl/CMakeLists.txt
@@ -6,6 +6,8 @@ if (WITH_TLS AND CJSON_FOUND)
 			${OPENSSL_INCLUDE_DIR} ${STDBOOL_H_PATH} ${STDINT_H_PATH}
 			${CJSON_INCLUDE_DIRS} ${mosquitto_SOURCE_DIR}/apps/mosquitto_passwd)
 
+	link_directories(${CJSON_DIR})
+
 	add_executable(mosquitto_ctrl
 		mosquitto_ctrl.c mosquitto_ctrl.h
 		client.c
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 38178c3e..e81d59cb 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -12,7 +12,7 @@ set( CLIENT_DIR ${mosquitto_BINARY_DIR}/lib)
 
 if (CJSON_FOUND)
 	add_definitions("-DWITH_CJSON")
-	set( CLIENT_DIR "${CLIENT_DIR} ${CJSON_DIR}" )
+	set( CLIENT_DIR "${CLIENT_DIR};${CJSON_DIR}" )
 	set( CLIENT_INC "${CLIENT_INC};${CJSON_INCLUDE_DIRS}" )
 endif()