diff --git a/ChangeLog b/ChangeLog
index ade76a5bc8..34ce1956d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun May 15 21:04:29 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (econv_init): revert r31353.  [ruby-dev:43512]
+
 Sun May 15 03:39:35 2011  Eric Hodel  <drbrain@segment7.net>
 
 	* ext/zlib/zlib.c:  Improve documentation.  Patch by Vincent Batts.
diff --git a/transcode.c b/transcode.c
index fbc7c5aecd..704c740442 100644
--- a/transcode.c
+++ b/transcode.c
@@ -3254,8 +3254,8 @@ rb_econv_init_by_convpath(VALUE self, VALUE convpath,
  *     :undef => :replace         # replace undefined conversion
  *     :replace => string         # replacement string ("?" or "\uFFFD" if not specified)
  *     :universal_newline => true # decorator for converting CRLF and CR to LF
- *     :crlf_newline => true      # decorator for converting CRLF to LF
- *     :cr_newline => true        # decorator for converting CR to LF
+ *     :crlf_newline => true      # decorator for converting LF to CRLF
+ *     :cr_newline => true        # decorator for converting LF to CR
  *     :xml => :text              # escape as XML CharData.
  *     :xml => :attr              # escape as XML AttValue
  *   integer form: