diff --git a/ChangeLog b/ChangeLog
index dc3299bbe9..a1e8a04d84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep 17 04:47:02 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.c (proc_options): -W should be allowed in RUBYOPT
+	  environment variable.  [ruby-core:12118]
+
 Mon Sep 17 04:31:46 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* range.c (range_step): fixed integer overflow.  [ruby-dev:31763]
diff --git a/ruby.c b/ruby.c
index 087da558de..9777695175 100644
--- a/ruby.c
+++ b/ruby.c
@@ -775,7 +775,7 @@ proc_options(argc, argv)
 		    }
 		}
 		if (!*s) break;
-		if (!strchr("IdvwrK", *s))
+		if (!strchr("IdvwWrK", *s))
 		    rb_raise(rb_eRuntimeError, "illegal switch in RUBYOPT: -%c", *s);
 		s = moreswitches(s);
 	    }
diff --git a/version.h b/version.h
index c89adf7d80..1593262b3b 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2007-09-17"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20070917
-#define RUBY_PATCHLEVEL 110
+#define RUBY_PATCHLEVEL 111
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8