diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3e5e30a5a80..d84e0f93bf5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-03  Douglas Gregor  <doug.gregor@gmail.com>
+
+       * c-opts.c (c_common_post_options): If C++0x mode is enabled, don't
+       warn about C++0x compatibility.
+	
 2007-02-04  Kazu Hirata  <kazu@codesourcery.com>
 
 	* config/h8300/h8300.c, config/h8300/h8300.h,
diff --git a/gcc/c-opts.c b/gcc/c-opts.c
index 720f72d52da..2b0bc5f7d55 100644
--- a/gcc/c-opts.c
+++ b/gcc/c-opts.c
@@ -1082,6 +1082,11 @@ c_common_post_options (const char **pfilename)
   if (flag_isoc99)
     flag_complex_method = 2;
 
+  /* If we're allowing C++0x constructs, don't warn about C++0x
+     compatibility problems.  */
+  if (flag_cpp0x)
+    warn_cxx0x_compat = 0;
+
   if (flag_preprocess_only)
     {
       /* Open the output now.  We must do so even if flag_no_output is