diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 48a4613b4771641174fe643a58ebdbfbec7a0108..d02bff462ff041dc2caa1c9e88eeb129091fe6da 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-02  Jonathan Wakely  <jwakely.gcc@gmail.com>
+
+	* parser.c (cp_parser_mem_initializer_list): Change error text.
+
 2010-06-02  Jakub Jelinek  <jakub@redhat.com>
 
 	* cp-objcp-common.c (shadowed_var_for_decl): Change into
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 4a50b556f4619e76429f7aca6ae21ca1817d6331..05d713c41c1fbfa61b50b169435d3898e41beee3 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -10136,7 +10136,7 @@ cp_parser_mem_initializer_list (cp_parser* parser)
      mem-initializer-list.  */
   if (!DECL_CONSTRUCTOR_P (current_function_decl))
     error_at (token->location,
-	      "only constructors take base initializers");
+	      "only constructors take member initializers");
 
   /* Loop through the list.  */
   while (true)