diff --git a/ChangeLog b/ChangeLog
index 5b9475d72c..b355a1a8d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jan 30 17:32:49 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/*.c: add GB12345, UCS-{2,4}{BE,LE}.
+
 Wed Jan 30 14:32:18 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* lib/rdoc/ri/driver.rb (cache_file_for): shoudn't use `:' in filename.
diff --git a/enc/gb2312.c b/enc/gb2312.c
index b8d0d0af57..be20fd8c31 100644
--- a/enc/gb2312.c
+++ b/enc/gb2312.c
@@ -10,3 +10,4 @@ Init_gb2312(void)
 
 ENC_ALIAS("EUC-CN", "GB2312");
 ENC_ALIAS("eucCN", "GB2312");
+ENC_REPLICATE("GB12345", "GB2312");
diff --git a/enc/koi8_r.c b/enc/koi8_r.c
index dfdf6d248a..93e5e70226 100644
--- a/enc/koi8_r.c
+++ b/enc/koi8_r.c
@@ -215,3 +215,5 @@ OnigEncodingDefine(koi8_r, KOI8_R) = {
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match
 };
+ENC_ALIAS("CP878", "KOI8-R");
+
diff --git a/enc/utf_16be.c b/enc/utf_16be.c
index 5311ba3641..2ef3199633 100644
--- a/enc/utf_16be.c
+++ b/enc/utf_16be.c
@@ -257,3 +257,4 @@ OnigEncodingDefine(utf_16be, UTF_16BE) = {
   utf16be_left_adjust_char_head,
   onigenc_always_false_is_allowed_reverse_match
 };
+ENC_ALIAS("UCS-2BE", "UTF-16BE");
diff --git a/enc/utf_32be.c b/enc/utf_32be.c
index bbf70cdb81..89eb17cb5d 100644
--- a/enc/utf_32be.c
+++ b/enc/utf_32be.c
@@ -191,3 +191,5 @@ OnigEncodingDefine(utf_32be, UTF_32BE) = {
   utf32be_left_adjust_char_head,
   onigenc_always_false_is_allowed_reverse_match
 };
+ENC_ALIAS("UCS-4BE", "UTF-32BE");
+
diff --git a/enc/utf_32le.c b/enc/utf_32le.c
index e9da83f20f..425a6ea832 100644
--- a/enc/utf_32le.c
+++ b/enc/utf_32le.c
@@ -191,3 +191,4 @@ OnigEncodingDefine(utf_32le, UTF_32LE) = {
   utf32le_left_adjust_char_head,
   onigenc_always_false_is_allowed_reverse_match
 };
+ENC_ALIAS("UCS-4LE", "UTF-32LE");