diff --git a/ChangeLog b/ChangeLog
index 6d02b07cd2..2270d3b3d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Oct 14 14:11:17 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (proc_options): -U can be followed by other options.
+
 Tue Oct 14 13:30:30 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
 	* enc/trans/single_byte.trans: added windows-1252
diff --git a/ruby.c b/ruby.c
index 29085979fa..5420b94aa2 100644
--- a/ruby.c
+++ b/ruby.c
@@ -792,7 +792,8 @@ proc_options(int argc, char **argv, struct cmdline_options *opt)
 
 	  case 'U':
 	    set_internal_encoding_once(opt, "UTF-8", 0);
-	    break;
+	    ++s;
+	    goto reswitch;
 
 	  case 'K':
 	    if (*++s) {