diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefilePartitionScanner.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefilePartitionScanner.java
index 57d543fd33f..0d7e3276432 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefilePartitionScanner.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefilePartitionScanner.java
@@ -64,18 +64,23 @@ public class MakefilePartitionScanner extends RuleBasedPartitionScanner {
 
 		// Add rule for single line comments.
 
-		rules.add(new EndOfLineRule("#", tComment)); //$NON-NLS-1$
+		rules.add(new EndOfLineRule("#", tComment, '\\')); //$NON-NLS-1$
 
 		rules.add(new EndOfLineRule("include", tInclude)); //$NON-NLS-1$
 
+		rules.add(new EndOfLineRule("export", tDef)); //$NON-NLS-1$
+		rules.add(new EndOfLineRule("unexport", tDef)); //$NON-NLS-1$
+		rules.add(new EndOfLineRule("vpath", tDef)); //$NON-NLS-1$
+		rules.add(new EndOfLineRule("override", tDef)); //$NON-NLS-1$
+		rules.add(new MultiLineRule("define", "endef", tDef)); //$NON-NLS-1$
+		rules.add(new MultiLineRule("override define", "endef", tDef)); //$NON-NLS-1$
+
 		// Add rules for multi-line comments and javadoc.
 		rules.add(new MultiLineRule("ifdef", "endif", tIf)); //$NON-NLS-1$
 		rules.add(new MultiLineRule("ifndef", "endif", tIf)); //$NON-NLS-1$
 		rules.add(new MultiLineRule("ifeq", "endif", tIf)); //$NON-NLS-1$
 		rules.add(new MultiLineRule("ifnneq", "endif", tIf)); //$NON-NLS-1$
 
-		rules.add(new MultiLineRule("define", "endef", tDef)); //$NON-NLS-1$
-
 		// Last rule must be supplied with default token!
 		rules.add(new MacroRule(tMacro, tOther)); //$NON-NLS-1$