diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 645efd7a040..f45750fd56e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2000-12-22  Jason Merrill  <jason@redhat.com>
+
+	* collect2.c (main): Use auto_demangling.
+
 2000-12-22  Alexandre Oliva  <aoliva@redhat.com>
 
 	* function.c (assign_parms): Update parm's DECL_INCOMING_RTL
@@ -127,20 +131,20 @@
 
 2000-12-20  Richard Henderson  <rth@redhat.com>
 
-        * c-typeck.c (build_asm_stmt): New, broken out from ...
-        (c_expand_asm_operands): ... here.  Just do rtl expansion.
-        (c_expand_return): Return the new stmt node.
-        (c_start_case, do_case): Likewise.
-        * c-common.c (c_expand_expr_stmt): Likewise.
-        * c-common.h: Update declarations.
-        * c-tree.h: Likewise.
-        * c-semantics.c (build_stmt): Use STMT_LINENO not TREE_COMPLEXITY.
-        * c-parse.in (fndef): Set DECL_SOURCE_LINE to the open brace.
-        (nested_function, notype_nested_function): Likewise.
-        (compstmt): Return the compound statement not the binding level.
-        (lineno_labeled_stmt): Simplify.
-        (lineno_stmt, lineno_label): Set STMT_LINENO.
-        (stmt, label): Return the new stmt node.
+	* c-typeck.c (build_asm_stmt): New, broken out from ...
+	(c_expand_asm_operands): ... here.  Just do rtl expansion.
+	(c_expand_return): Return the new stmt node.
+	(c_start_case, do_case): Likewise.
+	* c-common.c (c_expand_expr_stmt): Likewise.
+	* c-common.h: Update declarations.
+	* c-tree.h: Likewise.
+	* c-semantics.c (build_stmt): Use STMT_LINENO not TREE_COMPLEXITY.
+	* c-parse.in (fndef): Set DECL_SOURCE_LINE to the open brace.
+	(nested_function, notype_nested_function): Likewise.
+	(compstmt): Return the compound statement not the binding level.
+	(lineno_labeled_stmt): Simplify.
+	(lineno_stmt, lineno_label): Set STMT_LINENO.
+	(stmt, label): Return the new stmt node.
 
 2000-12-20  Bernd Schmidt  <bernds@redhat.com>
 
diff --git a/gcc/collect2.c b/gcc/collect2.c
index fcfdb34d76d..27ce9c344b2 100644
--- a/gcc/collect2.c
+++ b/gcc/collect2.c
@@ -916,7 +916,7 @@ main (argc, argv)
   obstack_begin (&permanent_obstack, 0);
   temporary_firstobj = (char *) obstack_alloc (&temporary_obstack, 0);
 
-  current_demangling_style = gnu_demangling;
+  current_demangling_style = auto_demangling;
   p = getenv ("COLLECT_GCC_OPTIONS");
   while (p && *p)
     {