diff --git a/ChangeLog b/ChangeLog
index 84dbdf41b5..e0f690d2bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar  9 23:51:26 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* test/ruby/test_io_m17n.rb (test_io_new_enc): "sjis" is now an alias
+	  of Windows-31J.
+
 Wed Mar  9 23:06:13 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* misc/ruby-mode.el (ruby-parse-partial): fix indent after aref.
diff --git a/test/ruby/test_io_m17n.rb b/test/ruby/test_io_m17n.rb
index a51c83258f..db1fe0b539 100644
--- a/test/ruby/test_io_m17n.rb
+++ b/test/ruby/test_io_m17n.rb
@@ -281,7 +281,7 @@ EOT
       fd = IO.sysopen("tmp")
       f = IO.new(fd, "r:sjis")
       begin
-        assert_equal(Encoding::Shift_JIS, f.read.encoding)
+        assert_equal(Encoding::Windows_31J, f.read.encoding)
       ensure
         f.close
       end