diff --git a/ChangeLog b/ChangeLog
index 8d828abcee..cb78943c6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Oct  4 19:02:59 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf.c (rb_nkf_enc_get): don't replicate encoding.
+	  [ruby-dev:36575]
+
 Sat Oct  4 18:47:22 2008  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/stringio/stringio.c (strio_external_encoding): defined.
diff --git a/ext/nkf/nkf.c b/ext/nkf/nkf.c
index 24761449d2..a0c14b55a4 100644
--- a/ext/nkf/nkf.c
+++ b/ext/nkf/nkf.c
@@ -69,9 +69,6 @@ rb_encoding* rb_nkf_enc_get(const char *name)
 	idx = rb_enc_find_index(nkf_enc_name(nkf_enc_to_base_encoding(nkf_enc)));
 	if (idx < 0) {
 	    idx = rb_define_dummy_encoding(name);
-	} else {
-	    rb_encoding *rb_enc = rb_enc_from_index(idx);
-	    idx = rb_enc_replicate(name, rb_enc);
 	}
     }
     return rb_enc_from_index(idx);