diff --git a/ChangeLog b/ChangeLog
index 7fbed9e950..fa9073e5c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Oct 27 20:34:43 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enumerator.c (enumerator_allocate): allow subclassing.
+
 Thu Oct 27 16:45:31 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (scan_once): wrong condition to use mbclen2().
@@ -80,7 +84,7 @@ Mon Oct 24 11:01:11 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 Mon Oct 24 07:57:56 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/tk/lib/tk/canvas.rb (TkCanvasItemConfig::__item_val2ruby_optkeys): 
+	* ext/tk/lib/tk/canvas.rb (TkCanvasItemConfig::__item_val2ruby_optkeys):
 	  typo fixed.  [ruby-talk:162187]
 
 	* ext/tk/lib/tk/menu.rb (TkMenuEntryConfig::__item_val2ruby_optkeys):
diff --git a/enumerator.c b/enumerator.c
index 9de5f23a98..7b3af9f66b 100644
--- a/enumerator.c
+++ b/enumerator.c
@@ -257,7 +257,7 @@ static VALUE
 enumerator_allocate(VALUE klass)
 {
     struct enumerator *ptr;
-    return Data_Make_Struct(rb_cEnumerator, struct enumerator,
+    return Data_Make_Struct(klass, struct enumerator,
 			    enumerator_mark, -1, ptr);
 }