diff --git a/HISTORY.rst b/HISTORY.rst
index f5e92b65..bd13e58e 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -8,6 +8,7 @@ PlatformIO 3.0
 ~~~~~~~~~~~~~~~~~~
 
 * Improved detecting of ARM mbed media disk for uploading
+* Improved Project Generator for CLion IDE when source folder contains nested items
 
 -------
 
diff --git a/platformio/ide/tpls/clion/CMakeListsPrivate.txt.tpl b/platformio/ide/tpls/clion/CMakeListsPrivate.txt.tpl
index 3397a070..85fef8f8 100644
--- a/platformio/ide/tpls/clion/CMakeListsPrivate.txt.tpl
+++ b/platformio/ide/tpls/clion/CMakeListsPrivate.txt.tpl
@@ -22,4 +22,4 @@ include_directories("{{include.replace("\\", "/")}}")
 % end
 % end
 
-aux_source_directory({{project_src_dir.replace("\\", "/")}} SRC_LIST)
+FILE(GLOB_RECURSE SRC_LIST {{project_src_dir.replace("\\", "/")}}/*.*)