diff --git a/ChangeLog b/ChangeLog
index 8666549e49..1b7c33468b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 14 10:44:35 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enumerator.c (lazy_grep_func): should use === instead of =~, as
+	  well as Enumerable#grep
+
 Wed Mar 14 08:15:54 2012  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* enumerator.c (lazy_zip_func): use each for non-Array objects.
diff --git a/enumerator.c b/enumerator.c
index 9a00d95dcc..f4ccda0121 100644
--- a/enumerator.c
+++ b/enumerator.c
@@ -103,7 +103,8 @@
  */
 VALUE rb_cEnumerator;
 VALUE rb_cLazy;
-static ID id_rewind, id_each, id_new, id_initialize, id_yield, id_call, id_next, id_result, id_lazy;
+static ID id_rewind, id_each, id_new, id_initialize, id_yield, id_call;
+static ID id_eqq, id_next, id_result, id_lazy;
 static VALUE sym_each;
 
 VALUE rb_eStopIteration;
@@ -1377,7 +1378,7 @@ static VALUE
 lazy_grep_func(VALUE val, VALUE m, int argc, VALUE *argv)
 {
     VALUE element = argv[1];
-    VALUE result = rb_funcall(m, rb_intern("=~"), 1, element);
+    VALUE result = rb_funcall(m, id_eqq, 1, element);
 
     if (RTEST(result)) {
 	return rb_funcall(argv[0], id_yield, 1, element);
@@ -1530,6 +1531,7 @@ Init_Enumerator(void)
     id_next = rb_intern("next");
     id_result = rb_intern("result");
     id_lazy = rb_intern("lazy");
+    id_eqq = rb_intern("===");
     sym_each = ID2SYM(id_each);
 
     InitVM(Enumerator);
diff --git a/test/ruby/test_lazy_enumerator.rb b/test/ruby/test_lazy_enumerator.rb
index caf222c235..9e50cd3a69 100644
--- a/test/ruby/test_lazy_enumerator.rb
+++ b/test/ruby/test_lazy_enumerator.rb
@@ -118,6 +118,8 @@ class TestLazyEnumerator < Test::Unit::TestCase
     assert_equal('f', a.current)
     assert_equal('c', a.lazy.grep(/c/).first)
     assert_equal('c', a.current)
+    assert_equal(%w[a e], a.grep(proc {|x| /[aeiou]/ =~ x}))
+    assert_equal(%w[a e], a.lazy.grep(proc {|x| /[aeiou]/ =~ x}).to_a)
   end
 
   def test_zip