diff --git a/ChangeLog b/ChangeLog
index b2d3ef804f..5853d7badb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Feb 13 16:56:52 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/cgi.rb (WEBrick::CGI.start): should set reason-phrase 
+	  to the value of status header field. ([ruby-dev:40617])
+
 Sun Feb 13 11:38:40 2005  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
 
 	* regparse.c (type_cclass_hash): (Thanks Nobu) fixed
diff --git a/lib/webrick/cgi.rb b/lib/webrick/cgi.rb
index 6878da5749..eb99dab523 100644
--- a/lib/webrick/cgi.rb
+++ b/lib/webrick/cgi.rb
@@ -45,7 +45,10 @@ module WEBrick
       res = HTTPResponse.new(@config)
       unless @config[:NPH] or defined?(MOD_RUBY)
         def res.setup_header
-          @header["status"] ||= @status
+          unless @header["status"]
+            phrase = HTTPStatus::reason_phrase(@status)
+            @header["status"] = "#{@status} #{phrase}"
+          end
           super
         end
         def res.status_line