diff --git a/cmake/project.cmake b/cmake/project.cmake
index d2e192ca..4224303a 100644
--- a/cmake/project.cmake
+++ b/cmake/project.cmake
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
-set(ELOS_VERSION 1.40.3)
+set(ELOS_VERSION 1.40.4)
 
 # Attention: Aside from the version, as many things as possible in this file
 #   should be put into functions, as this solves potential issues with commands
diff --git a/src/demos/CMakeLists.txt b/src/demos/CMakeLists.txt
index ed26b7d0..77e5b031 100644
--- a/src/demos/CMakeLists.txt
+++ b/src/demos/CMakeLists.txt
@@ -131,20 +131,22 @@ if (ELOS_DEMOS)
     install(TARGETS demo_eloslog DESTINATION ${CMAKE_INSTALL_BINDIR})
   endif()
 
-  add_executable(
-    mng_dlt_buffer
-    mng_dlt_buffer.c
-  )
+  if (ELOSD_LIBDLT)
+    add_executable(
+      mng_dlt_buffer
+      mng_dlt_buffer.c
+    )
 
-  target_link_libraries(
-    mng_dlt_buffer
-    PRIVATE
-      scanner_dlt_hv_interface
-  )
+    target_link_libraries(
+      mng_dlt_buffer
+      PRIVATE
+        scanner_dlt_hv_interface
+    )
 
-  if (INSTALL_ELOS_DEMOS)
-    install(TARGETS mng_dlt_buffer DESTINATION ${CMAKE_INSTALL_BINDIR})
-  endif()
+    if (INSTALL_ELOS_DEMOS)
+      install(TARGETS mng_dlt_buffer DESTINATION ${CMAKE_INSTALL_BINDIR})
+    endif()
+  endif (ELOSD_LIBDLT)
 
   add_executable(
     demo_eventbuffer
diff --git a/src/plugins/scanners/CMakeLists.txt b/src/plugins/scanners/CMakeLists.txt
index bcbb08c5..af67e8d3 100644
--- a/src/plugins/scanners/CMakeLists.txt
+++ b/src/plugins/scanners/CMakeLists.txt
@@ -8,4 +8,6 @@ add_subdirectory(kmsg)
 add_subdirectory(shmem)
 add_subdirectory(syslog)
 add_subdirectory(oomkiller)
-add_subdirectory(dlt_hv)
+if (ELOSD_LIBDLT)
+  add_subdirectory(dlt_hv)
+endif (ELOSD_LIBDLT)
diff --git a/test/utest/plugins/scanner/CMakeLists.txt b/test/utest/plugins/scanner/CMakeLists.txt
index fbb5dbbb..0d8d840d 100644
--- a/test/utest/plugins/scanner/CMakeLists.txt
+++ b/test/utest/plugins/scanner/CMakeLists.txt
@@ -2,4 +2,6 @@
 
 add_subdirectory(syslog)
 add_subdirectory(kmsg)
-add_subdirectory(dlt_hv)
+if (ELOSD_LIBDLT)
+  add_subdirectory(dlt_hv)
+endif (ELOSD_LIBDLT)