diff --git a/ChangeLog b/ChangeLog
index e591ba3351..a59416ac20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri Jun 29 15:43:59 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (fix_pow): get rid of division by zero.  reported by
+	  Yusuke ENDOH <mame AT tsg.ne.jp> [ruby-dev:31040]
+
+	* numeric.c (int_round): do nothing when rounding by zeroth digit.
+	  check underflow.  [ruby-dev:31043]
+
 Fri Jun 29 15:32:00 2007  Koichi Sasada  <ko1@atdot.net>
 
 	* configure.in: add fastcall attribute check.
diff --git a/numeric.c b/numeric.c
index 0f14df62ee..f3b6387bfa 100644
--- a/numeric.c
+++ b/numeric.c
@@ -2330,6 +2330,7 @@ fix_pow(VALUE x, VALUE y)
 	if (b == 0) return INT2FIX(1);
 	if (b == 1) return x;
 	a = FIX2LONG(x);
+	if (a == 0) return INT2FIX(0);
 	if (b > 0) {
 	    return int_pow(a, b);
 	}
@@ -2901,16 +2902,28 @@ int_round(int argc, VALUE* argv, VALUE num)
     VALUE n, f, h, r;
     int ndigits;
 
-    if (argc == 0) return num;
-    if (FIXNUM_P(num)) return num_round(argc, argv, num);
-
+    if (argc == 0) return 0;
     rb_scan_args(argc, argv, "1", &n);
     ndigits = NUM2INT(n);
     if (ndigits > 0) {
 	return rb_Float(num);
     }
+    if (ndigits == 0) {
+	return num;
+    }
     ndigits = -ndigits;
+    if (ndigits < 0) {
+	rb_raise(rb_eArgError, "ndigits out of range");
+    }
     f = int_pow(10, ndigits);
+    if (FIXNUM_P(num) && FIXNUM_P(f)) {
+	SIGNED_VALUE x = FIX2LONG(num), y = FIX2LONG(f);
+	int neg = x < 0;
+	if (neg) x = -x;
+	x = (x + y / 2) / y * y;
+	if (neg) x = -x;
+	return LONG2NUM(x);
+    }
     h = rb_funcall(f, '/', 1, INT2FIX(2));
     r = rb_funcall(num, '%', 1, f);
     n = rb_funcall(num, '-', 1, r);