diff --git a/ChangeLog b/ChangeLog
index a9f0f7f70f..48c62321bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+Sun Aug 20 11:46:52 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (num_step): also return an enumerator object if no block
+	  is given.
+
 Sat Aug 19 16:47:51 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
-	* ext/win32ole/win32ole.c (hash2named_arg): accept hash argument 
+	* ext/win32ole/win32ole.c (hash2named_arg): accept hash argument
 	  of symbol key.
 
 	* test/win32ole/test_win32ole.rb
diff --git a/numeric.c b/numeric.c
index 1a2f779318..3000158be1 100644
--- a/numeric.c
+++ b/numeric.c
@@ -1387,6 +1387,7 @@ num_step(int argc, VALUE *argv, VALUE from)
 {
     VALUE to, step;
 
+    RETURN_ENUMERATOR(from, argc, argv);
     if (argc == 1) {
 	to = argv[0];
 	step = INT2FIX(1);