diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 70caa2dd9d8e9fc9cd66ac1bbcecc9a772b97028..f47ae9459ee0576a90ac36becfb262f434912e2d 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+1998-05-27  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* friend.c (do_friend): Clarify template warning.
+
 1998-05-27  Mark Mitchell  <mark@markmitchell.com>
 
 	* decl.c (shadow_label): Don't treat decls as identifiers.
diff --git a/gcc/cp/friend.c b/gcc/cp/friend.c
index 8adeb600450efd54897f1f57ed46ef81f8adb02a..c6f68bd07f031acdcb1f8a4a149f3d731ca9e0b7 100644
--- a/gcc/cp/friend.c
+++ b/gcc/cp/friend.c
@@ -430,8 +430,9 @@ do_friend (ctype, declarator, decl, parmdecls, flags, quals, funcdef_flag)
 	      warning ("  declares a non-template function");
 	      if (! explained)
 		{
-		  warning ("  unless you compile with -fguiding-decls");
-		  warning ("  or add <> after the function name");
+		  warning ("  (if this is not what you intended, make sure");
+		  warning ("  the function template has already been declared,");
+		  warning ("  and add <> after the function name here)");
 		  explained = 1;
 		}
 	    }