diff --git a/HISTORY.rst b/HISTORY.rst
index 37e9edd5..0e692fe1 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -26,6 +26,10 @@ PlatformIO 3.0
 * Fixed an issue when ``pio run -t monitor`` always uses first ``monitor_port``
   even with multiple environments
   (`issue #1841 <https://github.com/platformio/platformio-core/issues/1841>`_)
+* Fixed an issue with broken includes when generating ``.clang_complete`` and
+  space is used in path
+  (`issue #1873 <https://github.com/platformio/platformio-core/issues/1873>`_)
+
 
 3.6.0 (2018-08-06)
 ~~~~~~~~~~~~~~~~~~
diff --git a/platformio/ide/tpls/atom/.clang_complete.tpl b/platformio/ide/tpls/atom/.clang_complete.tpl
index bc09ec0d..c00763c8 100644
--- a/platformio/ide/tpls/atom/.clang_complete.tpl
+++ b/platformio/ide/tpls/atom/.clang_complete.tpl
@@ -1,6 +1,6 @@
 % for include in includes:
--I{{include}}
+-I"{{include}}"
 % end
 % for define in defines:
 -D{{!define}}
-% end
\ No newline at end of file
+% end
diff --git a/platformio/ide/tpls/emacs/.clang_complete.tpl b/platformio/ide/tpls/emacs/.clang_complete.tpl
index bc09ec0d..c00763c8 100644
--- a/platformio/ide/tpls/emacs/.clang_complete.tpl
+++ b/platformio/ide/tpls/emacs/.clang_complete.tpl
@@ -1,6 +1,6 @@
 % for include in includes:
--I{{include}}
+-I"{{include}}"
 % end
 % for define in defines:
 -D{{!define}}
-% end
\ No newline at end of file
+% end