diff --git a/ChangeLog b/ChangeLog
index 8cc73cd3cd..c82982c187 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 25 00:11:02 2008  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c (declare_transcoder): arguments order changed.
+	  (rb_declare_transcoder): call declare_transcoder just once.
+
 Sun Aug 24 19:48:46 2008  Tanaka Akira  <akr@fsij.org>
 
 	* include/ruby/encoding.h (rb_econv_t): use rb_econv_option_t.
diff --git a/transcode.c b/transcode.c
index c0133c20e8..4e53d10dac 100644
--- a/transcode.c
+++ b/transcode.c
@@ -93,7 +93,7 @@ rb_register_transcoder(const rb_transcoder *tr)
 }
 
 static void
-declare_transcoder(const char *to, const char *from, const char *lib)
+declare_transcoder(const char *from, const char *to, const char *lib)
 {
     transcoder_entry_t *entry;
 
@@ -112,7 +112,6 @@ rb_declare_transcoder(const char *enc1, const char *enc2, const char *lib)
 		 lib ? lib : "(null)");
     }
     declare_transcoder(enc1, enc2, lib);
-    declare_transcoder(enc2, enc1, lib);
 }
 
 #define encoding_equal(enc1, enc2) (STRCASECMP(enc1, enc2) == 0)