diff --git a/CMSIS/Utilities/gen_pack.bat b/CMSIS/Utilities/gen_pack.bat
index 5b434d7..261e86d 100644
--- a/CMSIS/Utilities/gen_pack.bat
+++ b/CMSIS/Utilities/gen_pack.bat
@@ -48,6 +48,7 @@
 :: Copy CMSIS folder 
 :: -- Core files 
 XCOPY /Q /S /Y ..\..\CMSIS\Core\Include\*.* %RELEASE_PATH%\CMSIS\Core\Include\*.*
+XCOPY /Q /S /Y ..\..\CMSIS\Core\Include\*.* %RELEASE_PATH%\CMSIS\Include\*.*
 XCOPY /Q /S /Y ..\..\CMSIS\Core\Template\ARMv8-M\*.* %RELEASE_PATH%\CMSIS\Core\Template\ARMv8-M\*.*
 XCOPY /Q /S /Y ..\..\CMSIS\Core_A\Include\*.* %RELEASE_PATH%\CMSIS\Core_A\Include\*.*
 XCOPY /Q /S /Y ..\..\CMSIS\Core_A\Source\*.* %RELEASE_PATH%\CMSIS\Core_A\Source\*.*
@@ -60,6 +61,7 @@
 
 :: -- DSP files 
 XCOPY /Q /S /Y ..\..\CMSIS\DSP\Include\*.* %RELEASE_PATH%\CMSIS\DSP\Include\*.*
+XCOPY /Q /S /Y ..\..\CMSIS\DSP\Include\*.* %RELEASE_PATH%\CMSIS\Include\*.*
 XCOPY /Q /S /Y ..\..\CMSIS\DSP\Source\*.* %RELEASE_PATH%\CMSIS\DSP\Source\*.*
 XCOPY /Q /S /Y ..\..\CMSIS\DSP\Projects\*.* %RELEASE_PATH%\CMSIS\DSP\Projects\*.*
 XCOPY /Q /S /Y ..\..\CMSIS\DSP\Examples\*.* %RELEASE_PATH%\CMSIS\DSP\Examples\*.*
diff --git a/manifest b/manifest
index 6a0707a..38b424c 100644
--- a/manifest
+++ b/manifest
@@ -17,6 +17,7 @@
  - LICENSE.txt
  - Device/**/*
  - CMSIS/Core/Include/**/*
+ - CMSIS/Core/Include/**/*: CMSIS/Include/
  - CMSIS/Core/Template/**/*
  - CMSIS/Core_A/**/*
  - CMSIS/DAP/**/*
@@ -25,6 +26,7 @@
  - CMSIS/DSP/Source/**/*
  - CMSIS/DSP/Projects/**/*
  - CMSIS/DSP/Examples/**/*
+ - CMSIS/DSP/Include/**/*: CMSIS/Include/
  - CMSIS/DSP/Lib/**/*
  - CMSIS/NN/**/*
  - CMSIS/Pack/**/*