diff --git a/clang/include/clang/Basic/TokenKinds.def b/clang/include/clang/Basic/TokenKinds.def
index a390f4d753b5..d4c926514621 100644
--- a/clang/include/clang/Basic/TokenKinds.def
+++ b/clang/include/clang/Basic/TokenKinds.def
@@ -204,7 +204,7 @@ KEYWORD(inline                      , EXTC90)  // Ext in C90, ok in C99/C++
 KEYWORD(int                         , 0)
 KEYWORD(long                        , 0)
 KEYWORD(register                    , 0)
-KEYWORD(restrict                    , EXTC90)    // Ext in C90
+KEYWORD(restrict                    , NOTC90)    // Not in C90
 KEYWORD(return                      , 0)
 KEYWORD(short                       , 0)
 KEYWORD(signed                      , 0)
diff --git a/clang/test/Sema/c89.c b/clang/test/Sema/c89.c
index e7568bcb1b7f..4c89e82ba2d5 100644
--- a/clang/test/Sema/c89.c
+++ b/clang/test/Sema/c89.c
@@ -30,3 +30,6 @@ int test4 = 0LL;		/* expected-warning {{long long}} */
 /* PR1999 */
 void test5(register);
 
+/* PR2041 */
+int *restrict;
+