diff --git a/.gitignore b/.gitignore
index c90f033..c58c1f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 /build
 /core_driver
 /cmsis
+/cmsis-nn
 /openamp
 /rtos/freertos
 /rtos/threadx
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e0f38b..917c6d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019-2021 Arm Limited. All rights reserved.
+# SPDX-FileCopyrightText: Copyright 2019-2022 Arm Limited and/or its affiliates <open-source-office@arm.com>
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -28,6 +28,7 @@
 
 # Setup paths
 set(CMSIS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmsis" CACHE PATH "Path to CMSIS.")
+set(CMSIS_NN_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmsis-nn" CACHE PATH "Path to CMSIS-NN.")
 set(CMSIS_VIEW_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmsis-view" CACHE PATH "Path to cmsis-view.")
 set(CORE_DRIVER_PATH "${CMAKE_CURRENT_SOURCE_DIR}/core_driver" CACHE PATH "Path to core driver.")
 set(LINUX_DRIVER_STACK_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../linux_driver_stack" CACHE PATH "Path to Linux driver stack for Arm Ethos-U.")
diff --git a/tflite_micro.cmake b/tflite_micro.cmake
index e9d0926..e6db207 100644
--- a/tflite_micro.cmake
+++ b/tflite_micro.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 Arm Limited.
+# SPDX-FileCopyrightText: Copyright 2021-2022 Arm Limited and/or its affiliates <open-source-office@arm.com>
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -121,7 +121,7 @@
 #############################################################################
 
 if (NOT ${CORE_SOFTWARE_ACCELERATOR} STREQUAL "CPU")
-    add_subdirectory(${CMSIS_PATH}/CMSIS/NN cmsis_nn)
+    add_subdirectory(${CMSIS_NN_PATH} cmsis_nn)
 
     target_compile_options(cmsis-nn PRIVATE
         ${TFLU_OPTIMIZATION_LEVEL})
@@ -130,7 +130,7 @@
         ${TFLU_PATH}/kernels/cmsis_nn/*.cc)
 
     target_include_directories(tflu PUBLIC
-        ${CMSIS_PATH})
+        ${CMSIS_NN_PATH})
 
     target_compile_definitions(tflu PUBLIC
         CMSIS_NN)