diff --git a/ChangeLog b/ChangeLog
index 78733f210a..67bdbe37ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 26 12:36:36 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/generator.rb (Enumerator#__generator): Remove next() before
+	  overriding it to avoid a awarning.
+
 Wed Feb 25 23:37:56 2009  Tanaka Akira  <akr@fsij.org>
 
         * ext/socket/socket.c (unix_recv_io): prevent FD leak when 2 fd is
diff --git a/lib/generator.rb b/lib/generator.rb
index e6034a9f9a..2f4ceaa013 100644
--- a/lib/generator.rb
+++ b/lib/generator.rb
@@ -171,6 +171,9 @@ class Enumerator
   end
   private :__generator
 
+  # remove next() before overriding it to avoid a awarning
+  remove_method :next
+
   # call-seq:
   #   e.next   => object
   #