diff --git a/ChangeLog b/ChangeLog
index b9e8a8fb2b..4777286b86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-Fri Feb 15 18:44:05 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+Sat Feb 16 05:49:54 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/iso_8859_{4,13}.c: Windows-1257 is replica of ISO-8859-13.
 
 	* string.c (single_byte_optimizable): rb_enc_mbminlen must be 1
 	  when rb_enc_mbmaxlen is 1.
diff --git a/enc/iso_8859_13.c b/enc/iso_8859_13.c
index cbb79d9337..b821dadb53 100644
--- a/enc/iso_8859_13.c
+++ b/enc/iso_8859_13.c
@@ -231,3 +231,12 @@ OnigEncodingDefine(iso_8859_13, ISO_8859_13) = {
   onigenc_always_true_is_allowed_reverse_match
 };
 ENC_ALIAS("ISO8859-13", "ISO-8859-13");
+
+/*
+ * Name: windows-1257
+ * MIBenum: 2257
+ * http://www.microsoft.com/globaldev/reference/sbcs/1257.mspx
+ * http://en.wikipedia.org/wiki/Windows-1257
+ */
+ENC_REPLICATE("Windows-1257", "ISO-8859-13");
+ENC_ALIAS("CP1257", "Windows-1257");
diff --git a/enc/iso_8859_4.c b/enc/iso_8859_4.c
index f548ed581d..9c034b0409 100644
--- a/enc/iso_8859_4.c
+++ b/enc/iso_8859_4.c
@@ -240,5 +240,3 @@ OnigEncodingDefine(iso_8859_4, ISO_8859_4) = {
   onigenc_always_true_is_allowed_reverse_match
 };
 ENC_ALIAS("ISO8859-4", "ISO-8859-4");
-ENC_REPLICATE("Windows-1257", "ISO-8859-4");
-ENC_ALIAS("CP1257", "Windows-1257");