diff --git a/ChangeLog b/ChangeLog
index c42e388b70..5ee9fdabaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Nov 26 00:55:30 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httpresponse.rb: add HTTPResponse#keep_alive=.
+
+	* lib/webrick/httpserver.rb (HTTPServer#run): should pass the
+	  request's keep_alive flag to the response.
+
 Tue Nov 25 21:41:35 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* defines.h (ENV_IGNORECASE): should define when DOSISH without
diff --git a/lib/webrick/httpresponse.rb b/lib/webrick/httpresponse.rb
index 6b00c2b88b..667c4c46cd 100644
--- a/lib/webrick/httpresponse.rb
+++ b/lib/webrick/httpresponse.rb
@@ -25,7 +25,8 @@ module WEBrick
 
     attr_accessor :request_method, :request_uri, :request_http_version
     attr_accessor :filename
-    attr_reader :config, :keep_alive, :sent_size
+    attr_accessor :keep_alive
+    attr_reader :config, :sent_size
 
     def initialize(config)
       @config = config
diff --git a/lib/webrick/httpserver.rb b/lib/webrick/httpserver.rb
index cb5cd2af2f..11227cf517 100644
--- a/lib/webrick/httpserver.rb
+++ b/lib/webrick/httpserver.rb
@@ -47,6 +47,7 @@ module WEBrick
           res.request_method = req.request_method
           res.request_uri = req.request_uri
           res.request_http_version = req.http_version
+          res.keep_alive = req.keep_alive?
           if handler = @config[:RequestHandler]
             handler.call(req, res)
           end