diff --git a/components/freertos/CMakeLists.txt b/components/freertos/CMakeLists.txt
index d40948ec8a..f8e3141670 100644
--- a/components/freertos/CMakeLists.txt
+++ b/components/freertos/CMakeLists.txt
@@ -33,10 +33,11 @@ set(srcs
 
 set(include_dirs
     "${kernel_dir}/include" # FreeRTOS headers via #include "freertos/xxx.h"
-    "${kernel_dir}/portable/${arch}/include" # For arch-specific FreeRTOSConfig_arch.h in portable/<arch>/include
+    "${kernel_dir}/portable/${arch}/include" # For arch-specific #include "freertos/portmacro.h"
     "esp_additions/include/freertos"         # For files with #include "FreeRTOSConfig.h"
-    "esp_additions/include")                 # For files with #include "freertos/FreeRTOSConfig.h"
+    "esp_additions/include"                  # For files with #include "freertos/FreeRTOSConfig.h"
                                              #      or #include "freertos/task_snapshot.h"
+    "esp_additions/arch/${arch}/include")    # For #include "freertos/FreeRTOSConfig_arch.h"
 
 set(private_include_dirs
     "${kernel_dir}/portable/${arch}/include/freertos"
diff --git a/components/freertos/FreeRTOS-Kernel/portable/linux/include/freertos/FreeRTOSConfig_arch.h b/components/freertos/esp_additions/arch/linux/include/freertos/FreeRTOSConfig_arch.h
similarity index 100%
rename from components/freertos/FreeRTOS-Kernel/portable/linux/include/freertos/FreeRTOSConfig_arch.h
rename to components/freertos/esp_additions/arch/linux/include/freertos/FreeRTOSConfig_arch.h
diff --git a/components/freertos/FreeRTOS-Kernel/portable/riscv/include/freertos/FreeRTOSConfig_arch.h b/components/freertos/esp_additions/arch/riscv/include/freertos/FreeRTOSConfig_arch.h
similarity index 100%
rename from components/freertos/FreeRTOS-Kernel/portable/riscv/include/freertos/FreeRTOSConfig_arch.h
rename to components/freertos/esp_additions/arch/riscv/include/freertos/FreeRTOSConfig_arch.h
diff --git a/components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/FreeRTOSConfig_arch.h b/components/freertos/esp_additions/arch/xtensa/include/freertos/FreeRTOSConfig_arch.h
similarity index 100%
rename from components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/FreeRTOSConfig_arch.h
rename to components/freertos/esp_additions/arch/xtensa/include/freertos/FreeRTOSConfig_arch.h
diff --git a/tools/mocks/freertos/CMakeLists.txt b/tools/mocks/freertos/CMakeLists.txt
index a72dee3577..e6f3a2a171 100644
--- a/tools/mocks/freertos/CMakeLists.txt
+++ b/tools/mocks/freertos/CMakeLists.txt
@@ -10,7 +10,8 @@ set(include_dirs
     "${kernel_dir}/include"
     "${original_freertos_dir}/esp_additions/include"
     "${original_freertos_dir}/esp_additions/include/freertos"
-    "${kernel_dir}/portable/linux/include" # For FreeRTOSConfig_arch.h
+    "${original_freertos_dir}/esp_additions/arch/linux/include" # For "freertos/FreeRTOSConfig_arch.h"
+    "${kernel_dir}/portable/linux/include" # For "freertos/portmacro.h"
     "${kernel_dir}/include/freertos" # this is due to the way includes are generated in CMock (without freertos prefix)
 )