diff --git a/ChangeLog b/ChangeLog
index d81852e7e3..82d2e29226 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jan 11 13:30:35 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/webrick/accesslog.rb (WEBrick::AccessLog#format): fixed typo.
+
+	* lib/webrick/httpstatus.rb (WEBrick::HTTPStatus::Status#initialize):
+	  accept 0 or more arguments.  [ruby-dev:40021]
+
 Mon Jan 11 03:04:12 2010  Akinori MUSHA  <knu@iDaemons.org>
 
 	* eval.c (recursive_push): Taint internal hash to prevent
diff --git a/lib/webrick/accesslog.rb b/lib/webrick/accesslog.rb
index 75a3a3e694..0bed8097d5 100644
--- a/lib/webrick/accesslog.rb
+++ b/lib/webrick/accesslog.rb
@@ -53,7 +53,7 @@ module WEBrick
          when ?e, ?i, ?n, ?o
            raise AccessLogError,
              "parameter is required for \"#{spec}\"" unless param
-           param = params[spec][param] ? escape(param) : "-"
+           (param = params[spec][param]) ? escape(param) : "-"
          when ?t
            params[spec].strftime(param || CLF_TIME_FORMAT)
          when ?%
diff --git a/lib/webrick/httpstatus.rb b/lib/webrick/httpstatus.rb
index 0098749f83..6623983f87 100644
--- a/lib/webrick/httpstatus.rb
+++ b/lib/webrick/httpstatus.rb
@@ -12,9 +12,10 @@ module WEBrick
 
   module HTTPStatus
 
-    class Status      < StandardError
-      def initialize(message, *rest)
-        super(AccessLog.escape(message), *rest)
+    class Status < StandardError
+      def initialize(*args)
+        args[0] = AccessLog.escape(args[0]) unless args.empty?
+        super(*args)
       end
       class << self
         attr_reader :code, :reason_phrase