diff --git a/ChangeLog b/ChangeLog
index 1e01c93fa7..1a4f8bf7ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@ Fri Jan 18 09:22:07 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* encoding.c (rb_enc_find_index): use ASCII-8BIT if loading known
 	  encoding failed.
 
+	* parse.y (ripper_initialize): move parser->enc initialization.
+
 Fri Jan 18 07:06:25 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (Init_IO): stdin/stdout may not be duplex.
diff --git a/parse.y b/parse.y
index ca7cb6b13f..5e4cc13b41 100644
--- a/parse.y
+++ b/parse.y
@@ -9677,6 +9677,7 @@ ripper_initialize(int argc, VALUE *argv, VALUE self)
     else {
         StringValue(src);
         parser->parser_lex_gets = lex_get_str;
+	parser->enc = rb_enc_get(src);
     }
     parser->parser_lex_input = src;
     parser->eofp = Qfalse;