diff --git a/ChangeLog b/ChangeLog
index 688562acbd..3f607ac33e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jul 14 02:05:53 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* insns.def (opt_div): FIX2NUM may not work for corner cases.
+	  [ruby-dev:31210]
+
 Sat Jul 14 00:34:01 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* numeric.c (int_round): should not return false, but self.
diff --git a/insns.def b/insns.def
index 066b0a4723..c629386f39 100644
--- a/insns.def
+++ b/insns.def
@@ -1858,7 +1858,7 @@ opt_div
 		div -= 1;
 	    }
 	}
-	val = LONG2FIX(div);
+	val = LONG2NUM(div);
     }
     else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
 	if (0) {