diff --git a/ChangeLog b/ChangeLog
index ce207099c4..a8be741586 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,9 @@ Fri Jan 18 09:22:07 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* encoding.c (rb_enc_aliases_enc_i): exclude non alias names from
 	  Encoding.aliases.
 
+	* encoding.c (rb_enc_find_index): use original encoding name to
+	  load DLL.
+
 Fri Jan 18 07:06:25 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (Init_IO): stdin/stdout may not be duplex.
diff --git a/encoding.c b/encoding.c
index 07a1f8bfc9..505aaa9dcb 100644
--- a/encoding.c
+++ b/encoding.c
@@ -497,7 +497,7 @@ rb_enc_find_index(const char *name)
 	    enc_register_at(i, name, rb_enc_from_index(b));
 	}
 	else {
-	    i = load_encoding(name);
+	    i = load_encoding(rb_enc_name(enc));
 	    if (enc_autoload_p(rb_enc_from_index(i))) {
 		rb_warn("failed to load encoding (%s); use ASCII-8BIT instead",
 			name);