diff --git a/ChangeLog b/ChangeLog
index b162165f8b..4d47fddaa9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Apr 24 14:06:35 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (num_step): try to reduce residual on Float operations.
+
 Wed Apr 24 06:48:31 2002  Koji Arai  <jca02266@nifty.ne.jp>
 
 	* io.c (rb_io_mode_flags): both 'r+b' and 'rb+' should be allowed.
diff --git a/numeric.c b/numeric.c
index 58961d78ef..01dadb8471 100644
--- a/numeric.c
+++ b/numeric.c
@@ -769,8 +769,6 @@ num_step(argc, argv, from)
     VALUE from;
 {
     VALUE to, step;
-    VALUE i = from;
-    ID cmp;
 
     if (rb_scan_args(argc, argv, "11", &to, &step) == 1) {
 	step = INT2FIX(1);
@@ -798,19 +796,40 @@ num_step(argc, argv, from)
 		i += diff;
 	    }
 	}
-	return from;
     }
+    else if (TYPE(from) == T_FLOAT || TYPE(to) == T_FLOAT || TYPE(step) == T_FLOAT) {
+	double beg = NUM2DBL(from);
+	double end = NUM2DBL(to);
+	double unit = NUM2DBL(step);
+	double n = beg;
+	long i = 0;
 
-    if (RTEST(rb_funcall(step, '>', 1, INT2FIX(0)))) {
-	cmp = '>';
+	if (unit > 0) {
+	    for (i=0; n<=end; i++, n=unit*i+beg) {
+		rb_yield(rb_float_new(n));
+	    }
+	}
+	else {
+	    for (i=0; n>=end; i++, n=unit*i+beg) {
+		rb_yield(rb_float_new(n));
+	    }
+	}
     }
     else {
-	cmp = '<';
-    }
-    for (;;) {
-	if (RTEST(rb_funcall(i, cmp, 1, to))) break;
-	rb_yield(i);
-	i = rb_funcall(i, '+', 1, step);
+	VALUE i = from;
+	ID cmp;
+
+	if (RTEST(rb_funcall(step, '>', 1, INT2FIX(0)))) {
+	    cmp = '>';
+	}
+	else {
+	    cmp = '<';
+	}
+	for (;;) {
+	    if (RTEST(rb_funcall(i, cmp, 1, to))) break;
+	    rb_yield(i);
+	    i = rb_funcall(i, '+', 1, step);
+	}
     }
     return from;
 }