diff --git a/ChangeLog b/ChangeLog
index e12dba5d3c..e2dc59f55e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Oct 27 18:58:00 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* parse.y (parser_nextc): set encoding for the buffer of ripper.
+
 Fri Oct 28 06:06:08 2011  Tanaka Akira  <akr@fsij.org>
 
 	* ext/sdbm/_sdbm.c (sdbm_prep): set FD_CLOEXEC flags for file
diff --git a/parse.y b/parse.y
index 4bba2ef0b7..8f74e9a9c3 100644
--- a/parse.y
+++ b/parse.y
@@ -5440,6 +5440,7 @@ parser_nextc(struct parser_params *parser)
 	    if (parser->tokp < lex_pend) {
 		if (NIL_P(parser->delayed)) {
 		    parser->delayed = rb_str_buf_new(1024);
+		    rb_enc_associate(parser->delayed, parser->enc);
 		    rb_str_buf_cat(parser->delayed,
 				   parser->tokp, lex_pend - parser->tokp);
 		    parser->delayed_line = ruby_sourceline;