diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7ab31f3e8ad6..9290413c283f 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-26  David Binderman  <dcb314@hotmail.com>
+
+	PR c++/55632
+	* decl.c (grokdeclarator): Tidy publicp assignment.
+
 2013-02-25  Aldy Hernandez  <aldyh@redhat.com>
 
 	PR c++/56419
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 661969f441cc..a90044a488ae 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -10634,9 +10634,8 @@ grokdeclarator (const cp_declarator *declarator,
 	      }
 	  }
 
-	/* Record presence of `static'.  */
+	/* Record whether the function is public.  */
 	publicp = (ctype != NULL_TREE
-		   || storage_class == sc_extern
 		   || storage_class != sc_static);
 
 	decl = grokfndecl (ctype, type, original_name, parms, unqualified_id,