diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/MakeErrorParserTests.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/MakeErrorParserTests.java
index d4128879c87..95fc223f66f 100644
--- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/MakeErrorParserTests.java
+++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/MakeErrorParserTests.java
@@ -49,6 +49,7 @@ public class MakeErrorParserTests extends GenericErrorParserTests {
 
 	private static final String[] GMAKE_ERROR_STREAM1 = {
 		// Warning
+		"GNUmakefile:12: warning: overriding commands for target `target'",
 		"Makefile1:10: include.mk: No such file or directory",
 		// Errors
 		"Makefile2:10: *** missing separator.  Stop.",
@@ -56,11 +57,13 @@ public class MakeErrorParserTests extends GenericErrorParserTests {
 		"Makefile4:10: *** commands commence before first target. Stop.",
 		"Makefile5:10: *** Recursive variable 'VAR' references itself (eventually). Stop.",
 		"Makefile6:10: *** target pattern contains no `%'.  Stop.",
+		// Ignored
+		"mytest.cpp:19: warning: unused variable 'i'", // do not intercept compiler warnings
 	};
-	private static final int GMAKE_ERROR_STREAM1_WARNINGS = 1;
+	private static final int GMAKE_ERROR_STREAM1_WARNINGS = 2;
 	private static final int GMAKE_ERROR_STREAM1_ERRORS = 5;
-	private static final String[] GMAKE_ERROR_STREAM1_FILENAMES = {"Makefile1", "Makefile2",
-		"Makefile3", "Makefile4", "Makefile5", "Makefile6"};
+	private static final String[] GMAKE_ERROR_STREAM1_FILENAMES = {"GNUmakefile", "Makefile1",
+		"Makefile2", "Makefile3", "Makefile4", "Makefile5", "Makefile6"};
 
 	private static final String[] GMAKE_ERROR_STREAM2 = {
 		// Errors
diff --git a/core/org.eclipse.cdt.core/plugin.xml b/core/org.eclipse.cdt.core/plugin.xml
index 97edfb93299..5cb349500ae 100644
--- a/core/org.eclipse.cdt.core/plugin.xml
+++ b/core/org.eclipse.cdt.core/plugin.xml
@@ -268,7 +268,7 @@
          <pattern description-expr="make: $3" eat-processed-line="true" file-expr="$1" line-expr="$2" regex="(.*):(\d*): (\*\*\* .*)" severity="Error"/>
          <pattern description-expr="$0" eat-processed-line="true" file-expr="" line-expr="" regex=".*make.*: \*\*\* .*" severity="Error"/>
          <pattern description-expr="$0" eat-processed-line="true" file-expr="" line-expr="" regex=".*make.*: Target (.*) not remade because of errors." severity="Error"/>
-         <pattern description-expr="make: $3" eat-processed-line="true" file-expr="$1" line-expr="$2" regex="(.*):(\d*): warning: (.*)" severity="Warning"/>
+         <pattern description-expr="make: $3" eat-processed-line="true" file-expr="$1" line-expr="$2" regex="(.*[Mm]akefile):(\d*): warning: (.*)" severity="Warning"/>
          <pattern description-expr="$0" eat-processed-line="true" file-expr="" line-expr="" regex=".*make.*\[.*\] Error [-]{0,1}\d*.*" severity="Warning"/>
          <pattern description-expr="make: $3" eat-processed-line="true" file-expr="$1" line-expr="$2" regex="(.*):(\d*): (.*No such file or directory)" severity="Warning"/>
          <pattern description-expr="$0" eat-processed-line="true" file-expr="" line-expr="" regex=".*make.*: Circular .* dependency dropped." severity="Warning"/>