diff --git a/ChangeLog b/ChangeLog
index efbc4d660e..b14b04f998 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jan 11 09:37:53 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* numeric.c (Init_Numeric): turn off floating point exceptions
+	  on bcc32. "1e300".to_f had crashed by overflow.
+
 Mon Jan 10 23:07:45 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* variable.c (rb_autoload): hide internal data from ruby level.
diff --git a/numeric.c b/numeric.c
index abf4cda397..71a6d10c20 100644
--- a/numeric.c
+++ b/numeric.c
@@ -2768,6 +2768,9 @@ Init_Numeric()
 #elif defined(_UNICOSMP)
     /* Turn off floating point exceptions for divide by zero, etc. */
     _set_Creg(0, 0);
+#elif defined(__BORLANDC__)
+    /* Turn off floating point exceptions for overflow, etc. */
+    _control87(MCW_EM, MCW_EM);
 #endif
     id_coerce = rb_intern("coerce");
     id_to_i = rb_intern("to_i");