diff --git a/CMakeLists.txt b/CMakeLists.txt
index 90e6d7f2..92483ddf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,14 +99,15 @@ endif (WITH_THREADING)
 
 option(DOCUMENTATION "Build documentation?" ON)
 
-option(WITH_DLT "Include DLT support (requires WITH_DLT)?" OFF)
+option(WITH_DLT "Include DLT support?" OFF)
 message(STATUS "WITH_DLT = ${WITH_DLT}")
-if (${WITH_DLT} STREQUAL ON)
+if (WITH_DLT)
 	#find_package(DLT REQUIRED)
-        find_package(PkgConfig)
-        pkg_check_modules(DLT "automotive-dlt >= 2.11")
-        add_definitions("-DWITH_DLT")
-endif (${WITH_DLT} STREQUAL ON)
+	find_package(PkgConfig)
+	pkg_check_modules(DLT "automotive-dlt >= 2.11")
+	add_definitions("-DWITH_DLT")
+endif (WITH_DLT)
+
 # ========================================
 # Include projects
 # ========================================
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 8ed8ad2b..84f253ef 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -16,6 +16,7 @@ Broker features:
   DH support
 - Add explicit support for TLS v1.3.
 - Drop support for TLS v1.0.
+- Add support for Automotive DLT logging.
 
 Client library features:
 - Add mosquitto_subscribe_multiple() for sending subscriptions to multiple
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a1ed00a6..6a3fe7cf 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -120,11 +120,11 @@ endif (WIN32 OR CYGWIN)
 
 add_definitions (-DWITH_BROKER)
 
-if (${WITH_DLT} STREQUAL ON)
+if (WITH_DLT)
     message(STATUS "DLT_LIBDIR = ${DLT_LIBDIR}")
     link_directories(${DLT_LIBDIR})
     set (MOSQ_LIBS ${DLT_LIBRARIES})
-endif (${WITH_DLT} STREQUAL ON)
+endif (WITH_DLT)
 
 set (MOSQ_LIBS ${MOSQ_LIBS} ${OPENSSL_LIBRARIES})
 # Check for getaddrinfo_a