diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 49f131e42e6..cb3a9b16f43 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2015-09-23  Ville Voutilainen  <ville.voutilainen@gmail.com>
+
+	Fix small typos in the coding rule enforcement warnings.
+	* parser.c (cp_parser_namespace_definition): Replace 'namepace'
+	with 'namespace'.
+
 2015-09-22  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* decl.c (xref_basetypes): Check virtual and/or multiple
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index cc920926eae..114815660a2 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -17043,7 +17043,7 @@ cp_parser_namespace_definition (cp_parser* parser)
 
   has_visibility = handle_namespace_attrs (current_namespace, attribs);
 
-  warning  (OPT_Wnamespaces, "namepace %qD entered", current_namespace);
+  warning  (OPT_Wnamespaces, "namespace %qD entered", current_namespace);
 
   /* Parse the body of the namespace.  */
   cp_parser_namespace_body (parser);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 759219f62de..fa93d62cb4c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2015-09-23  Ville Voutilainen  <ville.voutilainen@gmail.com>
+
+	Fix small typos in the coding rule enforcement warnings.
+	* g++.dg/diagnostic/disable.C: Replace 'namepace'
+	with 'namespace'.
+
 2015-09-23   Richard Biener  <rguenther@suse.de>
 
 	PR middle-end/67662
diff --git a/gcc/testsuite/g++.dg/diagnostic/disable.C b/gcc/testsuite/g++.dg/diagnostic/disable.C
index a69033d98a8..7d86e073b26 100644
--- a/gcc/testsuite/g++.dg/diagnostic/disable.C
+++ b/gcc/testsuite/g++.dg/diagnostic/disable.C
@@ -3,7 +3,7 @@
 #include <iostream>
 #include <algorithm>
 
-namespace foo { } // { dg-warning "namepace" }
+namespace foo { } // { dg-warning "namespace" }
 
 template <typename X> X Foo (); // { dg-warning "template" }