diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/MakeFileResources.properties b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/MakeFileResources.properties
index cda473dc708..e99b122bce7 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/MakeFileResources.properties
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/MakeFileResources.properties
@@ -22,9 +22,11 @@ MakefileValidator.error.endefMissingOverrideDefine=endef missing [override] defi
 MakefileValidator.error.unknownDirective=unknow directive
 MakefileValidator.error.noMatchingEndifForCondition=No matching endif for condition
 MakefileValidator.error.noMatchingEndefForOverrideDefine=No matching endef for [override] define
-GNUMakefile.automatic.at=Target of the rule
-GNUMakefile.automatic.lt=First prerequisite of the rule
-GNUMakefile.automatic.star=Stem with which an implicit rule matches
-GNUMakefile.automatic.qm=All prerequisites that are newer than the target
-GNUMakefile.automatic.percent=Target member name, when the target is an archive member
-GNUMakefile.automatic.up=All prerequisites
+GNUMakefile.automaticVariable.at=Target of the rule
+GNUMakefile.automaticVariable.percent=Target member name, when the target is an archive member
+GNUMakefile.automaticVariable.less=First prerequisite of the rule
+GNUMakefile.automaticVariable.question=All prerequisites that are newer than the target
+GNUMakefile.automaticVariable.carrot=All prerequisites
+GNUMakefile.automaticVariable.plus=All prerequisites in order
+GNUMakefile.automaticVariable.pipe= Order-only prerequisites
+GNUMakefile.automaticVariable.star=Stem with which an implicit rule matches
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefile.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefile.java
index 4d2b4842f95..24fca08a106 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefile.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefile.java
@@ -77,13 +77,16 @@ public class GNUMakefile extends AbstractMakefile implements IGNUMakefile {
 	public static String FILE_SEPARATOR = System.getProperty("file.separator", "/"); //$NON-NLS-1$ //$NON-NLS-2$
 
 	String[] includeDirectories = new String[0];
+	@SuppressWarnings("nls")
 	IDirective[] builtins = new IDirective[]{
-		new AutomaticVariable(this, "<", MakefileMessages.getString("GNUMakefile.automatic.lt")),//$NON-NLS-1$//$NON-NLS-2$
-		new AutomaticVariable(this, "*", MakefileMessages.getString("GNUMakefile.automatic.star")),//$NON-NLS-1$//$NON-NLS-2$
-		new AutomaticVariable(this, "@", MakefileMessages.getString("GNUMakefile.automatic.at")),//$NON-NLS-1$//$NON-NLS-2$
-		new AutomaticVariable(this, "?", MakefileMessages.getString("GNUMakefile.automatic.qm")),//$NON-NLS-1$//$NON-NLS-2$
-		new AutomaticVariable(this, "%", MakefileMessages.getString("GNUMakefile.automatic.percent")),//$NON-NLS-1$//$NON-NLS-2$
-		new AutomaticVariable(this, "^", MakefileMessages.getString("GNUMakefile.automatic.up")),//$NON-NLS-1$//$NON-NLS-2$
+			new AutomaticVariable(this, "@", MakefileMessages.getString("GNUMakefile.automaticVariable.at")),
+			new AutomaticVariable(this, "%", MakefileMessages.getString("GNUMakefile.automaticVariable.percent")),
+			new AutomaticVariable(this, "<", MakefileMessages.getString("GNUMakefile.automaticVariable.less")),
+			new AutomaticVariable(this, "?", MakefileMessages.getString("GNUMakefile.automaticVariable.question")),
+			new AutomaticVariable(this, "^", MakefileMessages.getString("GNUMakefile.automaticVariable.carrot")),
+			new AutomaticVariable(this, "+", MakefileMessages.getString("GNUMakefile.automaticVariable.plus")),
+			new AutomaticVariable(this, "|", MakefileMessages.getString("GNUMakefile.automaticVariable.pipe")),
+			new AutomaticVariable(this, "*", MakefileMessages.getString("GNUMakefile.automaticVariable.star")),
 	};
 	private IMakefileReaderProvider makefileReaderProvider;
 
@@ -91,9 +94,6 @@ public class GNUMakefile extends AbstractMakefile implements IGNUMakefile {
 		super(null);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.make.core.makefile.IMakefile#getMakefileReaderProvider()
-	 */
 	@Override
 	public IMakefileReaderProvider getMakefileReaderProvider() {
 		return makefileReaderProvider;
@@ -104,9 +104,6 @@ public class GNUMakefile extends AbstractMakefile implements IGNUMakefile {
 		parse(URIUtil.toURI(filePath), new MakefileReader(reader));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.make.core.makefile.IMakefile#parse(java.net.URI, org.eclipse.cdt.make.core.makefile.IMakefileReaderProvider)
-	 */
 	@Override
 	public void parse(URI fileURI,
 			IMakefileReaderProvider makefileReaderProvider) throws IOException {
@@ -818,9 +815,6 @@ public class GNUMakefile extends AbstractMakefile implements IGNUMakefile {
 		return list.toArray(new IDirective[list.size()]);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.make.internal.core.makefile.AbstractMakefile#getBuiltins()
-	 */
 	@Override
 	public IDirective[] getBuiltins() {
 		return builtins;