diff --git a/ChangeLog b/ChangeLog
index 7e40485431..ad20670ed6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,8 @@
-Sun Dec  7 20:36:42 2003  Tanaka Akira  <akr@m17n.org>
+Sun Dec  7 20:54:17 2003  Tanaka Akira  <akr@m17n.org>
 
 	* ext/iconv/iconv.c (map_charset): make case sensitive.
 	  ext/iconv/charset_alias.rb (charset_alias): don't ignore
-	  config.charset's information.
+	  config.charset's information.  sort aliases.
 
 Sat Dec  6 22:58:03 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
diff --git a/ext/iconv/charset_alias.rb b/ext/iconv/charset_alias.rb
index 62742e62a8..7947fd8127 100644
--- a/ext/iconv/charset_alias.rb
+++ b/ext/iconv/charset_alias.rb
@@ -29,7 +29,7 @@ def charset_alias(config_charset, mapfile, target = OS)
     f.puts
     f.puts(comments)
     f.puts("class Iconv")
-    map.each {|can, sys| f.puts("  charset_map['#{can}'.freeze] = '#{sys}'.freeze")}
+    map.keys.sort.each {|can| f.puts("  charset_map['#{can}'.freeze] = '#{map[can]}'.freeze")}
     f.puts("end")
   end
 end