diff --git a/ChangeLog b/ChangeLog
index fd24c70e7a..ceee2230db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jan 20 09:12:26 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk: use -Ks when read insns.def. [ruby-dev#33185]
+
+	* parse.y: fix -e and stdin strings aren't set encoding.
+
 Sun Jan 20 05:12:44 2008  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* enc/make_encdb.rb: fix duplication check.
diff --git a/common.mk b/common.mk
index 0fbb2230d6..1b53989c4c 100644
--- a/common.mk
+++ b/common.mk
@@ -678,7 +678,7 @@ INSNS2VMOPT = --srcdir="$(srcdir)"
 
 $(INSNS): $(srcdir)/insns.def {$(VPATH)}vm_opts.h
 	$(RM) $(PROGRAM)
-	$(BASERUBY) $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT)
+	$(BASERUBY) -Ks $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT)
 
 minsns.inc: $(srcdir)/template/minsns.inc.tmpl
 
diff --git a/parse.y b/parse.y
index 88d168c320..3f4b8c29ce 100644
--- a/parse.y
+++ b/parse.y
@@ -4729,7 +4729,7 @@ lex_get_str(struct parser_params *parser, VALUE s)
 	if (*end++ == '\n') break;
     }
     lex_gets_ptr = end - RSTRING_PTR(s);
-    return STR_NEW(beg, end - beg);
+    return rb_enc_str_new(beg, end - beg, rb_enc_get(s));
 }
 
 static VALUE