diff --git a/event_recorder.cmake b/event_recorder.cmake
index bb9efd9..0b70b57 100644
--- a/event_recorder.cmake
+++ b/event_recorder.cmake
@@ -1,6 +1,5 @@
 #
-# Copyright (c) 2021 Arm Limited. All rights reserved.
-#
+# SPDX-FileCopyrightText: Copyright 2021, 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the License); you may
@@ -19,7 +18,11 @@
 add_library(rte_component INTERFACE)
 target_include_directories(rte_component INTERFACE lib/rte_component/include)
 target_link_libraries(rte_component INTERFACE cmsis_device)
-target_compile_definitions(rte_component INTERFACE RTE_Components_CMSIS_device_header=\"${ARM_CPU}${ARM_FEATURES}.h\")
+if(${CMSIS_VER} EQUAL 5)
+    target_compile_definitions(rte_component INTERFACE RTE_Components_CMSIS_device_header=\"${ARM_CPU}${ARM_FEATURES}.h\")
+else()
+    target_compile_definitions(rte_component INTERFACE RTE_Components_CMSIS_device_header=\"${ARM_CPU}.h\")
+endif()
 
 add_library(event_recorder INTERFACE)