diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 951faf4af49..6b661bd3df4 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-26  Simon Martin  <simartin@users.sourceforge.net>
+
+	PR c++/32111
+	* decl.c (grokdeclarator): Reset friendp for member functions declared
+	friend of their own class.
+
 2007-06-23  Mark Mitchell  <mark@codesourcery.com>
 
 	* decl2.c (determine_visibility): Don't look for dllexport here.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 33f1c2a311a..7d4123fe969 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -8057,7 +8057,10 @@ grokdeclarator (const cp_declarator *declarator,
       if (ctype == current_class_type)
 	{
 	  if (friendp)
-	    pedwarn ("member functions are implicitly friends of their class");
+	    {
+	      pedwarn ("member functions are implicitly friends of their class");
+	      friendp = 0;
+	    }
 	  else
 	    pedwarn ("extra qualification %<%T::%> on member %qs",
 		     ctype, name);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index eb9251f094c..1621e7cfc88 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-26  Simon Martin  <simartin@users.sourceforge.net>
+
+	PR c++/32111
+	* g++.dg/other/friend5.C: New test.
+
 2007-06-25  Paul Thomas  <pault@gcc.gnu.org>
 
 	PR fortran/32464
diff --git a/gcc/testsuite/g++.dg/other/friend5.C b/gcc/testsuite/g++.dg/other/friend5.C
new file mode 100644
index 00000000000..45bbf272ecd
--- /dev/null
+++ b/gcc/testsuite/g++.dg/other/friend5.C
@@ -0,0 +1,9 @@
+/* PR c++/32111 */
+/* This used to ICE. */
+
+/* { dg-do "compile" } */
+
+struct A
+{
+  friend A::~A() {} /* { dg-error "implicitly friends of their class" } */
+};