diff --git a/ChangeLog b/ChangeLog
index 69fb3c41cc..9158bc7f48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@ Wed Oct 25 00:58:19 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* win32/mkexports.rb, win32/resource.rb: use unique variable names.
 
+Tue Oct 24 18:51:27 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_zip): add RETURN_ENUMERATOR() to zip method.
+
 Mon Oct 23 04:30:04 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* marshal.c (r_object0): use return value from proc given as the
diff --git a/enum.c b/enum.c
index 419a2b98e4..4836aef72b 100644
--- a/enum.c
+++ b/enum.c
@@ -1178,6 +1178,7 @@ enum_zip(int argc, VALUE *argv, VALUE obj)
     for (i=0; i<argc; i++) {
 	argv[i] = rb_convert_type(argv[i], T_ARRAY, "Array", "to_a");
     }
+    RETURN_ENUMERATOR(obj, argc, argv);
     result = rb_block_given_p() ? Qnil : rb_ary_new();
     memo[0] = result;
     memo[1] = rb_ary_new4(argc, argv);