diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 91999073880..0e93424521d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-08  Jonathan Wakely  <jwakely.gcc@gmail.com>
+
+	* doc/cpp.texi (Predefined Macros): __STRICT_ANSI__ is defined
+	for -std=c++98 and -std=c++11 too.
+
 2012-01-08  Chung-Lin Tang  <cltang@codesourcery.com>
 
 	* cfgloop.c (cancel_loop): Add free() of bbs array.
diff --git a/gcc/doc/cpp.texi b/gcc/doc/cpp.texi
index 230d32bdfc0..658ab98be01 100644
--- a/gcc/doc/cpp.texi
+++ b/gcc/doc/cpp.texi
@@ -2020,8 +2020,8 @@ testing @code{@w{(__GNUC__ && __cplusplus)}}.
 
 @item __STRICT_ANSI__
 GCC defines this macro if and only if the @option{-ansi} switch, or a
-@option{-std} switch specifying strict conformance to some version of ISO C,
-was specified when GCC was invoked.  It is defined to @samp{1}.
+@option{-std} switch specifying strict conformance to some version of ISO C
+or ISO C++, was specified when GCC was invoked.  It is defined to @samp{1}.
 This macro exists primarily to direct GNU libc's header files to
 restrict their definitions to the minimal set found in the 1989 C
 standard.