diff --git a/ChangeLog b/ChangeLog
index 47bb3e69e7..c3d5dd922a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Apr 27 08:06:15 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ruby.c (ruby_set_argv): ARGV should be locale encoding.
+	  [ruby-list:44861]
+
 Sun Apr 27 01:46:29 2008  Tanaka Akira  <akr@fsij.org>
 
 	* lib/open3.rb (Open3.popen3w): removed.
diff --git a/ruby.c b/ruby.c
index 1c67ce262c..7301f1ef50 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1457,6 +1457,7 @@ void
 ruby_set_argv(int argc, char **argv)
 {
     int i;
+    rb_encoding *enc = rb_locale_encoding();
     VALUE av = rb_argv;
 
 #if defined(USE_DLN_A_OUT)
@@ -1468,6 +1469,7 @@ ruby_set_argv(int argc, char **argv)
     rb_ary_clear(av);
     for (i = 0; i < argc; i++) {
 	VALUE arg = rb_tainted_str_new2(argv[i]);
+	rb_enc_associate(arg, enc);
 
 	OBJ_FREEZE(arg);
 	rb_ary_push(av, arg);
diff --git a/version.h b/version.h
index d3a64d1990..8b305fce66 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-04-26"
+#define RUBY_RELEASE_DATE "2008-04-27"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20080426
+#define RUBY_RELEASE_CODE 20080427
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 26
+#define RUBY_RELEASE_DAY 27
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];