diff --git a/ChangeLog b/ChangeLog
index 16664b6cd5..d3f73bc7e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Dec 30 17:43:54 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (Init_Encoding): registered rb_encoding differs from
+	  ONIG_ENCODINGs.
+
 Sun Dec 30 13:56:15 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (program): clear input strings after all process.
diff --git a/encoding.c b/encoding.c
index 969fd94be7..955764049c 100644
--- a/encoding.c
+++ b/encoding.c
@@ -1011,7 +1011,7 @@ Init_Encoding(void)
     /* dummy for unsupported, statefull encoding */
     rb_define_dummy_encoding("ISO-2022-JP");
 
-    rb_enc_replicate("Windows-31J", ONIG_ENCODING_SJIS);
+    rb_enc_replicate("Windows-31J", rb_enc_from_index(ENCINDEX_SJIS));
     rb_enc_alias("CP932", "Windows-31J");
 
     for (i = 0; i < enc_table_size; ++i) {