diff --git a/ChangeLog b/ChangeLog
index 291d8fcf78..5db0de9827 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,10 @@ Mon Oct 22 11:03:09 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* include/ruby/encoding.h (rb_enc_compatible): prototype.
 
+Mon Oct 22 19:24:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.c (proc_options): allow space after -E (encoding) option.
+
 Sun Oct 21 18:29:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* encoding.c (rb_enc_default, rb_enc_primary): return pointers to
diff --git a/ruby.c b/ruby.c
index ffdf45a151..8b14419e76 100644
--- a/ruby.c
+++ b/ruby.c
@@ -689,7 +689,8 @@ proc_options(int argc, char **argv, struct cmdline_options *opt)
 
 	  case 'E':
 	    if (!*++s) {
-		rb_raise(rb_eRuntimeError, "missing argument for -E");
+		s = argv[1];
+		argc--, argv++;
 	    }
 	    goto encoding;