diff --git a/ChangeLog b/ChangeLog
index 56da6b151a..57e71a779a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep 16 00:06:18 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/cgi.rb (WEBrick::CGI::Socket#initialize): should set
+	  $stdout.binmode.
+
 Thu Sep 15 23:25:21 2005  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
 	* lib/{soap,wsdl,xsd}, test/{soap,wsdl,xsd}: imported soap4r/1.5.5.
diff --git a/lib/webrick/cgi.rb b/lib/webrick/cgi.rb
index 29fa67d188..2b6d2313b9 100644
--- a/lib/webrick/cgi.rb
+++ b/lib/webrick/cgi.rb
@@ -128,6 +128,7 @@ module WEBrick
         @header_part = StringIO.new
         @body_part = stdin
         @out_port = stdout
+        @out_port.binmode
   
         @server_addr = @env["SERVER_ADDR"] || "0.0.0.0"
         @server_name = @env["SERVER_NAME"]