diff --git a/ChangeLog b/ChangeLog
index bccf408a44..8469e32410 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Sep 15 23:36:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (struct parser_params): common members in the parser and
+	  ripper must be placed at each same location.
+
 Sat Sep 15 18:25:15 2007  Kouhei Sutou  <kou@cozmixng.org>
 
 	* string.c (rb_str_rstrip_bang): fixed too much rstrip. [ruby-dev:31786]
diff --git a/parse.y b/parse.y
index 5171fb4741..86f0a78c85 100644
--- a/parse.y
+++ b/parse.y
@@ -236,6 +236,7 @@ struct parser_params {
     int line_count;
     int has_shebang;
     int parser_ruby_sourceline;	/* current line no. */
+    rb_encoding *enc;
 
 #ifndef RIPPER
     /* Ruby core only */
@@ -257,8 +258,6 @@ struct parser_params {
     VALUE parsing_thread;
     int toplevel_p;
 #endif
-
-    rb_encoding *enc;
 };
 
 #define STR_NEW(p,n) rb_enc_str_new((p),(n),parser->enc)