2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 33f32c9ad8..9a3223bcd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 13 07:54:00 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.c (proc_options): add -U command line option to specify
+	  utf-8 as default_internal.
+
 Mon Oct 13 07:42:57 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* transcode.c (str_transcode0): String#encode() with no encoding
diff --git a/ruby.c b/ruby.c
index 67b5a4fd3a..0b4929d88a 100644
--- a/ruby.c
+++ b/ruby.c
@@ -758,6 +758,10 @@ proc_options(int argc, char **argv, struct cmdline_options *opt)
 	    if (!*++s) goto next_encoding;
 	    goto encoding;
 
+	  case 'U':
+	    opt->intern.enc.name = rb_str_new2("utf-8");
+	    break;
+
 	  case 'K':
 	    if (*++s) {
 		const char *enc_name = 0;