diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 661f89d779377c263d6c8a52fe37d62ec95a4f4b..e545c6ca397f338cb6e39840ccad2b84cc3adcdc 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-03  Douglas Gregor  <doug.gregor@gmail.com>
+
+       * parser.c (cp_lexer_get_preprocessor_token): Attach the C++0x
+       keyword warning to -Wc++0x-compat.
+	
 2007-02-03  Gabriel Dos Reis  <gdr@integrable-solutions.net>
 
 	* decl.c (grokdeclarator): Update documentation.
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index fa18e20b99e931d74dbe8582c9f2cbd466a1be0c..7578f848a1fe5c0feebb5d356bdaf01662e8fa66 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -449,7 +449,8 @@ cp_lexer_get_preprocessor_token (cp_lexer *lexer ATTRIBUTE_UNUSED ,
             {
               /* Warn about the C++0x keyword (but still treat it as
                  an identifier).  */
-              warning (0, "identifier %<%s%> will become a keyword in C++0x",
+              warning (OPT_Wc__0x_compat, 
+                       "identifier %<%s%> will become a keyword in C++0x",
                        IDENTIFIER_POINTER (token->u.value));
 
               /* Clear out the C_RID_CODE so we don't warn about this