diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d280f9ce6ee..79995c51a91 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-09  Gabriel Dos Reis  <gdr@codesourcery.com>
+
+	* lex.c (DEF_OPERATOR): Say `operator@' -not- `operator @'
+	whenever @ is a symbolic name.
+
 2000-06-08  Mark Mitchell  <mark@codesourcery.com>
 
 	Remove old ABI mangling code.
diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c
index d5f8cd4d059..9df7b1c6e3e 100644
--- a/gcc/cp/lex.c
+++ b/gcc/cp/lex.c
@@ -468,9 +468,9 @@ init_operators ()
   
 #define DEF_OPERATOR(NAME, CODE, MANGLING, ARITY, ASSN_P) \
   my_friendly_assert ((strlen ("operator ") + strlen (NAME) + 1		    \
-		       <= 256),						    \
+                       + ISALPHA (NAME[0])  <= 256),    		    \
 		      20000526);					    \
-  sprintf (buffer, "operator %s", NAME);				    \
+  sprintf (buffer, ISALPHA (NAME[0]) ? "operator %s" : "operator%s", NAME); \
   identifier = get_identifier (buffer);					    \
   IDENTIFIER_OPNAME_P (identifier) = 1;					    \
 									    \