diff --git a/apps/mosquitto_ctrl/CMakeLists.txt b/apps/mosquitto_ctrl/CMakeLists.txt
index 201d07ac..fef60f26 100644
--- a/apps/mosquitto_ctrl/CMakeLists.txt
+++ b/apps/mosquitto_ctrl/CMakeLists.txt
@@ -17,7 +17,6 @@ if(WITH_TLS AND CJSON_FOUND)
 	)
 
 	target_include_directories(mosquitto_ctrl PRIVATE
-		"${OPENSSL_INCLUDE_DIR}"
 		"${STDBOOL_H_PATH}"
 		"${STDINT_H_PATH}"
 		"${mosquitto_SOURCE_DIR}"
@@ -57,7 +56,7 @@ if(WITH_TLS AND CJSON_FOUND)
 
 	target_link_libraries(mosquitto_ctrl
 	  PRIVATE
-		${OPENSSL_LIBRARIES}
+		OpenSSL::SSL
 		cJSON
 	)
 
diff --git a/apps/mosquitto_passwd/CMakeLists.txt b/apps/mosquitto_passwd/CMakeLists.txt
index 75120186..3d853d64 100644
--- a/apps/mosquitto_passwd/CMakeLists.txt
+++ b/apps/mosquitto_passwd/CMakeLists.txt
@@ -10,7 +10,6 @@ if(WITH_TLS)
 	)
 
 	target_include_directories(mosquitto_passwd PRIVATE
-		"${OPENSSL_INCLUDE_DIR}"
 		"${STDBOOL_H_PATH}"
 		"${STDINT_H_PATH}"
 		"${mosquitto_SOURCE_DIR}"
@@ -22,7 +21,7 @@ if(WITH_TLS)
 
     target_link_libraries(mosquitto_passwd
 	  PRIVATE
-		${OPENSSL_LIBRARIES}
+		OpenSSL::SSL
 	)
 
 	install(TARGETS mosquitto_passwd
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index fb0362aa..9ec540ce 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -58,7 +58,9 @@ if (WITH_THREADING AND WIN32)
 	list(APPEND C_SRC "../common/winthread_mosq.c" "../common/winthread_mosq.h")
 endif()
 
-set (LIBRARIES ${OPENSSL_LIBRARIES})
+if(WITH_TLS)
+	set (LIBRARIES OpenSSL::SSL)
+endif()
 
 if(UNIX AND NOT APPLE AND NOT ANDROID)
 	find_library(LIBRT rt)
@@ -104,7 +106,6 @@ endif()
 target_include_directories(libmosquitto
 	PUBLIC
 		"${mosquitto_SOURCE_DIR}/include"
-		"${OPENSSL_INCLUDE_DIR}"
 	PRIVATE
 		"${STDBOOL_H_PATH}"
 		"${STDINT_H_PATH}"
@@ -152,7 +153,6 @@ if(WITH_STATIC_LIBRARIES)
 	target_link_libraries(libmosquitto_static PRIVATE ${LIBRARIES})
 
 	target_include_directories(libmosquitto_static PRIVATE
-		"${OPENSSL_INCLUDE_DIR}"
 		"${STDBOOL_H_PATH}"
 		"${STDINT_H_PATH}"
 		"${mosquitto_SOURCE_DIR}"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f7f9af12..fb43f09b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -148,7 +148,9 @@ endif()
 
 add_definitions (-DWITH_BROKER)
 
-set (MOSQ_LIBS ${MOSQ_LIBS} ${OPENSSL_LIBRARIES})
+if(WITH_TLS)
+	set (MOSQ_LIBS ${MOSQ_LIBS} OpenSSL::SSL)
+endif()
 # Check for getaddrinfo_a
 include(CheckLibraryExists)
 check_library_exists(anl getaddrinfo_a  "" HAVE_GETADDRINFO_A)
@@ -225,11 +227,9 @@ endif()
 target_include_directories(mosquitto
 	PUBLIC
 		"${mosquitto_SOURCE_DIR}/include"
-		"${OPENSSL_INCLUDE_DIR}"
 	PRIVATE
 		"${STDBOOL_H_PATH}"
 		"${STDINT_H_PATH}"
-		"${mosquitto_SOURCE_DIR}"
 		"${mosquitto_SOURCE_DIR}/common"
 		"${mosquitto_SOURCE_DIR}/lib"
 		"${mosquitto_SOURCE_DIR}/src"