diff --git a/ChangeLog b/ChangeLog
index efc83b0580..82737333a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jul 14 02:51:52 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (fix_pow): 0**2 should not raise floating point
+	  exception.  [ruby-dev:31216]
+
 Sat Jul 14 02:25:48 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* numeric.c (int_pow): wrong overflow detection.  [ruby-dev:31213]
diff --git a/numeric.c b/numeric.c
index 2dc1dd18bf..1f306df657 100644
--- a/numeric.c
+++ b/numeric.c
@@ -2241,6 +2241,7 @@ fix_pow(x, 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);
 	}