diff --git a/ChangeLog b/ChangeLog
index f1959af3cc..2f2a9eb710 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri May 18 01:28:21 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/parser.c (transcode_string): fix encoding index names.
+	  Thanks markizko for reporting.
+
 Thu May 17 23:03:58 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in: fix function name to be checked, to initialize
diff --git a/ext/psych/parser.c b/ext/psych/parser.c
index 6f4c4569e9..0908a1b49f 100644
--- a/ext/psych/parser.c
+++ b/ext/psych/parser.c
@@ -79,8 +79,8 @@ static VALUE make_exception(yaml_parser_t * parser, VALUE path)
 static VALUE transcode_string(VALUE src, int * parser_encoding)
 {
     int utf8    = rb_utf8_encindex();
-    int utf16le = rb_enc_find_index("UTF16_LE");
-    int utf16be = rb_enc_find_index("UTF16_BE");
+    int utf16le = rb_enc_find_index("UTF-16LE");
+    int utf16be = rb_enc_find_index("UTF-16BE");
     int source_encoding = rb_enc_get_index(src);
 
     if (source_encoding == utf8) {