diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java
index 100869ea675..7b0caad42a7 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java
@@ -3341,7 +3341,7 @@ public class AST2CPPTests extends AST2BaseTest {
 	
 	public void testBug87424() throws Exception {
 		IASTTranslationUnit tu = parse(
-				"int * restrict x;", ParserLanguage.CPP, true); //$NON-NLS-1$
+				"int * __restrict x;", ParserLanguage.CPP, true); //$NON-NLS-1$
 		CPPNameCollector col = new CPPNameCollector();
 		tu.accept(col);
 		
@@ -3350,7 +3350,7 @@ public class AST2CPPTests extends AST2BaseTest {
 		assertTrue(t instanceof IGPPPointerType);
 		assertTrue(((IGPPPointerType) t).isRestrict());
 		
-		tu = parse("class A {}; int A::* restrict x;", ParserLanguage.CPP, true); //$NON-NLS-1$
+		tu = parse("class A {}; int A::* __restrict x;", ParserLanguage.CPP, true); //$NON-NLS-1$
 		col = new CPPNameCollector();
 		tu.accept(col);
 		
@@ -5973,6 +5973,13 @@ public class AST2CPPTests extends AST2BaseTest {
 		parseAndCheckBindings(getAboveComment(), ParserLanguage.CPP);
 	}
 	
+	// void restrict();
+	public void testRestrictIsNoCPPKeyword_Bug228826() throws Exception {
+		final String code = getAboveComment();
+		parseAndCheckBindings(code, ParserLanguage.CPP, false);
+		parseAndCheckBindings(getAboveComment(), ParserLanguage.CPP, true);  // even with gnu extensions
+	}
+	
 	// void test1();
 	// void test2() throw ();
 	// void test3() throw (int);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/GPPScannerExtensionConfiguration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/GPPScannerExtensionConfiguration.java
index 20b1f4412d1..d3f8db54758 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/GPPScannerExtensionConfiguration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/GPPScannerExtensionConfiguration.java
@@ -33,7 +33,6 @@ public class GPPScannerExtensionConfiguration extends GNUScannerExtensionConfigu
 	
 	public GPPScannerExtensionConfiguration() {
 		addMacro("__null", "0");  //$NON-NLS-1$//$NON-NLS-2$
-		addKeyword(Keywords.cRESTRICT, IToken.t_restrict);
 		addKeyword(Keywords.c_COMPLEX, IToken.t__Complex);
 		addKeyword(Keywords.c_IMAGINARY, IToken.t__Imaginary);
 	}