diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9bfe9944386..08854dbc852 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,14 +1,18 @@
+Tue Feb 10 20:36:52 1998  Jason Merrill  <jason@yorick.cygnus.com>
+			  Manfred Hollstein  <manfred@s-direktnet.de>
+
+	* decl.c (grokdeclarator): Use DECL_USE_TEMPLATE instead
+	when deciding to override DECL_ASSEMBLER_NAME.
+
 Tue Feb 10 15:30:55 EST 1998 Andrew MacLeod <amacleod@torpedo.to.cygnus.com>
 
 	* decl2.c (lang_f_options): Add -fsquangle to option processing list.
-
 	* cp-tree.h (flag_do_squangling): Add declaration.
-
 	* lang-options.h: Add -fsquangle and -fno-squangle.
-
 	* method.c: Add macros and static variables for squangling.
 	(build_overload_name): Rename to build_mangled_name, add logic for B 
-	compression, and split into process_modifiers and process_overload_item.
+	compression, and split into process_modifiers and 
+	process_overload_item.
 	(process_modifiers): New function, to handle constant, reference, 
 	and pointer types. 
 	(process_overload_item): New function, handles issue of type codes.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index f61cec487f9..c4b229fb993 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -9930,7 +9930,7 @@ grokdeclarator (declarator, declspecs, decl_context, initialized, attrlist)
 	  return NULL_TREE;
 
 	if (ctype == NULL_TREE && DECL_LANGUAGE (decl) != lang_c
-	    && (!DECL_TEMPLATE_SPECIALIZATION (decl) ||
+	    && (! DECL_USE_TEMPLATE (decl) ||
 		name_mangling_version < 1)) 
 	  DECL_ASSEMBLER_NAME (decl) = current_namespace_id (declarator);