diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileDocumentSetupParticipant.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileDocumentSetupParticipant.java
index 3824e8f921b..4bd6745bf0d 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileDocumentSetupParticipant.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileDocumentSetupParticipant.java
@@ -20,7 +20,7 @@ import org.eclipse.jface.text.rules.FastPartitioner;
 
 /**
  * MakefileDocumentSetupParticipant
- * The document setup participant for Ant.
+ * The document setup participant for Makefile.
  */
 public class MakefileDocumentSetupParticipant  implements IDocumentSetupParticipant {
 	
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MacroDefinitionRule.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MacroDefinitionRule.java
index a59af52c31a..928bae15b48 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MacroDefinitionRule.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MacroDefinitionRule.java
@@ -95,7 +95,7 @@ class MacroDefinitionRule implements IPredicateRule {
 		scanner.unread();
 
 		if (state == FINISH_STATE) {
-			scanToEndOfLine(scanner);
+			//scanToEndOfLine(scanner);
 			return token;
 		}
 
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefileCodeScanner.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefileCodeScanner.java
index 0763dae72e9..f073880e5ae 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefileCodeScanner.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefileCodeScanner.java
@@ -78,7 +78,8 @@ public class MakefileCodeScanner extends AbstractMakefileCodeScanner {
 		MultiLineRule defineRule = new MultiLineRule("define", "endef", macroDef); //$NON-NLS-1$ //$NON-NLS-2$
 		defineRule.setColumnConstraint(0);
 		rules.add(defineRule);
-		rules.add(new MacroDefinitionRule(macroDef, other));
+
+//		rules.add(new MacroDefinitionRule(macroDef, other));
 
 		// Add word rule for keywords, types, and constants.
 		// We restring the detection of the keywords to be the first column to be valid.
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefileWordDetector.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefileWordDetector.java
index d255dc1368f..a648a9b1ec7 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefileWordDetector.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefileWordDetector.java
@@ -14,8 +14,9 @@ import org.eclipse.jface.text.rules.IWordDetector;
 
 public class MakefileWordDetector implements IWordDetector {
 
-	private static final String correctStartSpecChars = "%*().><"; //$NON-NLS-1$
-	private static final String correctSpecChars = "@$/\\"; //$NON-NLS-1$
+	//private static final String correctStartSpecChars = "%*().><"; //$NON-NLS-1$
+	private static final String correctStartSpecChars = "%*()><"; //$NON-NLS-1$
+	private static final String correctSpecChars = "@$/\\_"; //$NON-NLS-1$
 
 	/**
 	 * @see IWordDetector#isWordPart(character)