diff --git a/plugins/dynamic-security/CMakeLists.txt b/plugins/dynamic-security/CMakeLists.txt
index 58a22928..ef7ff1a7 100644
--- a/plugins/dynamic-security/CMakeLists.txt
+++ b/plugins/dynamic-security/CMakeLists.txt
@@ -1,40 +1,36 @@
-set( CLIENT_INC ${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/include
-	${STDBOOL_H_PATH} ${STDINT_H_PATH} ${PTHREAD_INCLUDE_DIR}
-	${OPENSSL_INCLUDE_DIR} ${mosquitto_SOURCE_DIR}/deps
-	${mosquitto_SOURCE_DIR}/src)
+if (CJSON_FOUND AND WITH_TLS)
+	set( CLIENT_INC ${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/include
+		${STDBOOL_H_PATH} ${STDINT_H_PATH} ${PTHREAD_INCLUDE_DIR}
+		${OPENSSL_INCLUDE_DIR} ${mosquitto_SOURCE_DIR}/deps
+		${mosquitto_SOURCE_DIR}/src
+		${CJSON_INCLUDE_DIRS} )
 
-set( CLIENT_DIR ${mosquitto_BINARY_DIR}/lib)
+	set( CLIENT_DIR ${mosquitto_BINARY_DIR}/lib ${CJSON_DIR})
 
-if (CJSON_FOUND)
-	set( CLIENT_DIR "${CLIENT_DIR} ${CJSON_DIR}" )
-	set( CLIENT_INC "${CLIENT_INC};${CJSON_INCLUDE_DIRS}" )
-endif()
-
-include_directories(${CLIENT_INC})
-link_directories(${CLIENT_DIR})
+	include_directories(${CLIENT_INC})
+	link_directories(${CLIENT_DIR})
 
-add_library(mosquitto_dynamic_security SHARED
-	acl.c
-	auth.c
-	clients.c
-	clientlist.c
-	dynamic_security.h
-	groups.c
-	grouplist.c
-	json_help.c
-	json_help.h
-	plugin.c
-	roles.c
-	rolelist.c
-	sub_matches_sub.c)
+	add_library(mosquitto_dynamic_security SHARED
+		acl.c
+		auth.c
+		clients.c
+		clientlist.c
+		dynamic_security.h
+		groups.c
+		grouplist.c
+		json_help.c
+		json_help.h
+		plugin.c
+		roles.c
+		rolelist.c
+		sub_matches_sub.c)
 
-set_target_properties(mosquitto_dynamic_security PROPERTIES
-	POSITION_INDEPENDENT_CODE 1
-)
-set_target_properties(mosquitto_dynamic_security PROPERTIES PREFIX "")
+	set_target_properties(mosquitto_dynamic_security PROPERTIES
+		POSITION_INDEPENDENT_CODE 1
+	)
+	set_target_properties(mosquitto_dynamic_security PROPERTIES PREFIX "")
 
-if (CJSON_FOUND)
 	target_link_libraries(mosquitto_dynamic_security ${CJSON_LIBRARIES})
-endif()
 
-install(TARGETS mosquitto_dynamic_security RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+	install(TARGETS mosquitto_dynamic_security RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+endif()
diff --git a/plugins/dynamic-security/Makefile b/plugins/dynamic-security/Makefile
index 42b701e4..c708082a 100644
--- a/plugins/dynamic-security/Makefile
+++ b/plugins/dynamic-security/Makefile
@@ -18,7 +18,17 @@ OBJS=	\
 		rolelist.o \
 		sub_matches_sub.o
 
-all : binary
+ifeq ($(WITH_CJSON),yes)
+ifeq ($(WITH_TLS),yes)
+ALL_DEPS:= binary
+else
+ALL_DEPS:=
+endif
+else
+ALL_DEPS:=
+endif
+
+all : ${ALL_DEPS}
 binary : ${PLUGIN_NAME}.so
 
 ${PLUGIN_NAME}.so : ${OBJS}