diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 17f3d60c1a2..2b764ee9ece 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-18  Richard Henderson  <rth@redhat.com>
+
+	* tree-eh.c (decide_copy_try_finally): Fix scaling of copy and
+	switch estimates.
+
 2004-06-18  Andrew Pinski  <pinskia@physics.uc.edu>
 
 	* config/i386/darwin.h (HOT_TEXT_SECTION_NAME): Define.
diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c
index a4a0bc41d6e..27f33c9141f 100644
--- a/gcc/tree-eh.c
+++ b/gcc/tree-eh.c
@@ -1246,9 +1246,9 @@ decide_copy_try_finally (int ndests, tree finally)
 
   /* ??? These numbers are completely made up so far.  */
   if (optimize > 1)
-    return f_estimate < 100 || f_estimate * 2 < sw_estimate;
+    return f_estimate < 100 || f_estimate < sw_estimate * 2;
   else
-    return f_estimate < 40 || f_estimate * 3 < sw_estimate * 2;
+    return f_estimate < 40 || f_estimate * 2 < sw_estimate * 3;
 }
 
 /* A subroutine of lower_eh_constructs_1.  Lower a TRY_FINALLY_EXPR nodes