diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index de1a29893f69..c6f47f9ffc51 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,8 +1,14 @@
+2011-10-14  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/17212
+	* c-family/c.opt ([Wformat-zero-length]): Add C++ and Objective-C++.
+	* doc/invoke.texi: Update.
+
 2011-10-14  Iain Sandoe  <iains@gcc.gnu.org>
 
 	PR bootstrap/50699
 	* config/darwin.c (darwin_patch_builtin): Adjust argument type. Only
-	build for powerpc targets.  (darwin_patch_builtins): Only build for 
+	build for powerpc targets.  (darwin_patch_builtins): Only build for
 	powerpc targets.
 
 2011-10-14  Jakub Jelinek  <jakub@redhat.com>
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 48a61c9706a2..28d8308460d9 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-14  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/17212
+	* g++.dg/warn/format6.C: New.
+	* obj-c++.dg/warn6.mm: Likewise.
+
 2011-10-13  Richard Henderson  <rth@redhat.com>
 
 	* lib/target-supports.exp (check_effective_target_vect_shift_scalar):