diff --git a/HISTORY.rst b/HISTORY.rst
index 4b9a0ca4..eaa6768d 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,6 +4,11 @@ Release Notes
 PlatformIO 3.0
 --------------
 
+3.5.1 (2018-??-??)
+~~~~~~~~~~~~~~~~~~
+
+* Fixed project generator for CLion IDE
+
 3.5.0 (2017-12-28)
 ~~~~~~~~~~~~~~~~~~
 
diff --git a/docs b/docs
index a8665ce5..9ba6ef3f 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit a8665ce53b7b37c85c9f92047cb76e555eddc7ba
+Subproject commit 9ba6ef3fad7585002a628fc81b1f970f3d4b98e3
diff --git a/platformio/ide/tpls/clion/CMakeListsPrivate.txt.tpl b/platformio/ide/tpls/clion/CMakeListsPrivate.txt.tpl
index ca27ad43..225a3b67 100644
--- a/platformio/ide/tpls/clion/CMakeListsPrivate.txt.tpl
+++ b/platformio/ide/tpls/clion/CMakeListsPrivate.txt.tpl
@@ -8,7 +8,9 @@ SET(CMAKE_C_FLAGS_DISTRIBUTION "{{cc_flags}}")
 set(CMAKE_CXX_STANDARD 11)
 
 % for define in defines:
-add_definitions(-D{{!define}})
+% if "##" not in define:
+add_definitions("-D{{!define.replace("(", "\(").replace(")", "\)").replace('"', '\\"')}}")
+% end
 % end
 
 % for include in includes: