diff --git a/ChangeLog b/ChangeLog
index 5579fad657..9f4321b64f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 26 11:22:55 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.escape): should
+	  escape space.
+
 Sun Jul 25 10:56:28 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* win32/win32.{h,c} (rb_w32_{f,fd,fs}open): workaround for bcc32's
diff --git a/lib/webrick/httputils.rb b/lib/webrick/httputils.rb
index 16d3c4d56b..79ea9d1f47 100644
--- a/lib/webrick/httputils.rb
+++ b/lib/webrick/httputils.rb
@@ -340,7 +340,7 @@ module WEBrick
     def _unescape(str, regex) str.gsub(regex){ $1.hex.chr } end
     module_function :_make_regex, :_escape, :_unescape
 
-    UNESCAPED = _make_regex(control+delims+unwise+nonascii)
+    UNESCAPED = _make_regex(control+space+delims+unwise+nonascii)
     UNESCAPED_FORM = _make_regex(reserved+control+delims+unwise+nonascii)
     NONASCII  = _make_regex(nonascii)
     ESCAPED   = /%([0-9a-fA-F]{2})/