diff --git a/config.cmake b/config.cmake
index 41b3c68a03a..c582b733b9b 100644
--- a/config.cmake
+++ b/config.cmake
@@ -367,6 +367,14 @@ if(NOT (KernelBenchmarks STREQUAL "none"))
 else()
     config_set(KernelEnableBenchmarks ENABLE_BENCHMARKS OFF)
 endif()
+
+# Reflect the existance of kernel Log buffer
+if(KernelBenchmarksTrackKernelEntries OR KernelBenchmarksTracepoints)
+    config_set(KernelLogBuffer KERNEL_LOG_BUFFER ON)
+else()
+    config_set(KernelLogBuffer KERNEL_LOG_BUFFER OFF)
+endif()
+
 config_string(
     KernelMaxNumTracePoints MAX_NUM_TRACE_POINTS
     "Use TRACE_POINT_START(k) and TRACE_POINT_STOP(k) macros for recording data, \
diff --git a/libsel4/include/sel4/config.h b/libsel4/include/sel4/config.h
index 8a705ae1187..5ae039efc9d 100644
--- a/libsel4/include/sel4/config.h
+++ b/libsel4/include/sel4/config.h
@@ -9,9 +9,3 @@
 /* Compile-time configuration parameters. Might be set by the build system. */
 
 #include <autoconf.h>
-
-/* Configurations requring the kernel log buffer */
-#if defined CONFIG_BENCHMARK_TRACK_KERNEL_ENTRIES || \
-    defined CONFIG_BENCHMARK_TRACEPOINTS
-#define CONFIG_KERNEL_LOG_BUFFER
-#endif