diff --git a/core/org.eclipse.cdt.core/ChangeLog b/core/org.eclipse.cdt.core/ChangeLog
index 412eb791d93..948f9b1cde4 100644
--- a/core/org.eclipse.cdt.core/ChangeLog
+++ b/core/org.eclipse.cdt.core/ChangeLog
@@ -1,3 +1,10 @@
+2005-04-11 Vladimir Hirsl
+	Fix for PR 90193: Scanner faililng on Local/User paths as provided in Std. Make
+	User specified include paths (through the UI) are now created with 
+	isSystemInclude attribute set to true.
+	
+	* model/org/eclipse/cdt/core/model/CoreModel.java
+
 2005-04-08 Vladimir Hirsl
 	Added offset and length parameters for index entries.
 	Refactoring of AbstractIndexer. Moved old parser specific stuff to the appropriate subclass.
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CoreModel.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CoreModel.java
index 02abda16d57..34102a97311 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CoreModel.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CoreModel.java
@@ -454,7 +454,7 @@ public class CoreModel {
 	 * @return IIncludeEntry
 	 */
 	public static IIncludeEntry newIncludeEntry(IPath resourcePath, IPath basePath, IPath includePath) {
-		return newIncludeEntry(resourcePath, basePath, includePath, false);
+		return newIncludeEntry(resourcePath, basePath, includePath, true);
 	}
 
 	/**
@@ -529,7 +529,7 @@ public class CoreModel {
 	 * @return IIincludeEntry
 	 */
 	public static IIncludeEntry newIncludeRefEntry(IPath resourcePath, IPath baseRef, IPath includePath) {
-		return new IncludeEntry(resourcePath, null, baseRef, includePath, false, null, false);
+		return new IncludeEntry(resourcePath, null, baseRef, includePath, true, null, false);
 	}
 
 	/**
diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index d70719173d5..617c23039cc 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,10 @@
+2005-04-11 Vladimir Hirsl
+	Fix for PR 90193: Scanner faililng on Local/User paths as provided in Std. Make
+	User specified include paths (through the UI) are now created with 
+	isSystemInclude attribute set to true.
+	
+	* src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElement.java
+
 2005-04-08 Alain Magloire
 	New icons from the IBM folks(Patch from DDaoust)
 	* icons/*
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElement.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElement.java
index c8d84b9d8c8..4fd5c761ac5 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElement.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElement.java
@@ -96,7 +96,7 @@ public class CPElement {
 			case IPathEntry.CDT_INCLUDE :
 				createAttributeElement(INCLUDE, new Path("")); //$NON-NLS-1$
 				createAttributeElement(EXCLUSION, new Path[0]);
-				createAttributeElement(SYSTEM_INCLUDE, Boolean.valueOf(false));
+				createAttributeElement(SYSTEM_INCLUDE, Boolean.valueOf(true));
 				createAttributeElement(BASE_REF, new Path("")); //$NON-NLS-1$
 				createAttributeElement(BASE, new Path("")); //$NON-NLS-1$
 				break;