diff --git a/HISTORY.rst b/HISTORY.rst
index 85cbdfa8..c56bd057 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -23,6 +23,9 @@ PlatformIO 2.0
   (`issue #380 <https://github.com/platformio/platformio/issues/380>`_)
 * Fixed issue with code builder when build path contains spaces
   (`issue #387 <https://github.com/platformio/platformio/issues/387>`_)
+* Fixed project generator for Eclipse IDE and "duplicate path entries found
+  in project path"
+  (`issue #383 <https://github.com/platformio/platformio/issues/383>`_)
 
 
 2.6.0 (2015-12-15)
diff --git a/platformio/ide/tpls/eclipse/.cproject.tpl b/platformio/ide/tpls/eclipse/.cproject.tpl
index 08b8a369..28d12111 100644
--- a/platformio/ide/tpls/eclipse/.cproject.tpl
+++ b/platformio/ide/tpls/eclipse/.cproject.tpl
@@ -24,6 +24,9 @@
 							<tool id="org.eclipse.cdt.build.core.settings.holder.1624502120" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
 								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.239157887" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
 									% for include in includes:
+									% if "toolchain" in include:
+									% continue
+									% end
                                     % if include.startswith(user_home_dir):
                                     % if "windows" in systype:
 									<listOptionValue builtIn="false" value="${USERPROFILE}{{include.replace(user_home_dir, '')}}"/>
@@ -45,6 +48,9 @@
 							<tool id="org.eclipse.cdt.build.core.settings.holder.54121539" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
 								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.1096940598" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
 									% for include in includes:
+									% if "toolchain" in include:
+									% continue
+									% end
                                     % if include.startswith(user_home_dir):
                                     % if "windows" in systype:
 									<listOptionValue builtIn="false" value="${USERPROFILE}{{include.replace(user_home_dir, '')}}"/>
@@ -66,6 +72,9 @@
 							<tool id="org.eclipse.cdt.build.core.settings.holder.1310559623" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
 								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.41298875" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
 									% for include in includes:
+									% if "toolchain" in include:
+									% continue
+									% end
                                     % if include.startswith(user_home_dir):
                                     % if "windows" in systype:
 									<listOptionValue builtIn="false" value="${USERPROFILE}{{include.replace(user_home_dir, '')}}"/>