diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/CCommandDSC.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/CCommandDSC.java
index 533772d2326..ecc6439f43b 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/CCommandDSC.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/CCommandDSC.java
@@ -101,7 +101,7 @@ public class CCommandDSC {
 	 * Returns a command where -imacros and -include options have been removed
 	 * @return
 	 */
-	public String getSCDRunnableCommand() {
+	public String getSCDRunnableCommand(boolean quoteIncludePaths) {
 		String commandAsString = new String();
 		for (Iterator i = compilerCommand.iterator(); i.hasNext(); ) {
 			KVStringPair optionPair = (KVStringPair)i.next();
@@ -113,8 +113,16 @@ public class CCommandDSC {
     			if (optionPair.getKey().equals(SCDOptionsEnum.IMACROS_FILE.toString()) ||
     					optionPair.getKey().equals(SCDOptionsEnum.INCLUDE_FILE.toString()))
     				continue;
-    			commandAsString += optionPair.getKey() + SINGLE_SPACE + 
-                                   optionPair.getValue() + SINGLE_SPACE;
+    			if (quoteIncludePaths) {
+    				if (optionPair.getKey().equals(SCDOptionsEnum.INCLUDE.toString())) {
+    					commandAsString += optionPair.getKey() + SINGLE_SPACE + 
+    							"\"" + optionPair.getValue() + "\"" + SINGLE_SPACE;  //$NON-NLS-1$//$NON-NLS-2$
+    				}
+    			}
+    			else {
+	    			commandAsString += optionPair.getKey() + SINGLE_SPACE + 
+	                                   optionPair.getValue() + SINGLE_SPACE;
+    			}
             }
 		}
 		return commandAsString.trim();
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/SCDMakefileGenerator.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/SCDMakefileGenerator.java
index 9e305aa81cf..0950319ae33 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/SCDMakefileGenerator.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/SCDMakefileGenerator.java
@@ -84,7 +84,7 @@ public class SCDMakefileGenerator extends DefaultRunSIProvider {
                     buffer.append(':');
                     buffer.append(ENDL);
                     buffer.append("\t@echo begin generating scanner info for $@"+ENDL+"\t"); //$NON-NLS-1$ //$NON-NLS-2$
-                    buffer.append(cmd.getSCDRunnableCommand());
+                    buffer.append(cmd.getSCDRunnableCommand(true)); // quoteIncludePaths
                     buffer.append(" -E -P -v -dD "); //$NON-NLS-1$
                     buffer.append(cmd.appliesToCPPFileType() ? "specs.cpp" : "specs.c"); //$NON-NLS-1$ //$NON-NLS-2$
                     buffer.append(ENDL);