diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 9c4ef1823e9e08c1f4a77d4ae3e41e1fc84656ba..4396def23e3f8a774ec857fa040219b7e2036db1 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Fixed webrick_server cookie handling to allow multiple cookes to be set at once #800, #813 [dave@cherryville.org]
+
 * Fixed the Rakefile's interaction with postgresql use PGPASSWORD and PGHOST in the environment to fix prompting for passwords when connecting to a remote db and local socket connections. Also added a '-x' flag to pg_dump which stops it dumping privileges #807 [rasputnik]
 
 * Fixed the Rakefile's interaction with postgresql to quote the user name and use template0 when dumping so the functions doesn't get dumped too #855 [pburleson]
diff --git a/railties/lib/webrick_server.rb b/railties/lib/webrick_server.rb
index 49244837ef630bbca2437b667e5ef4590c88d569..cc4586712857d5b14edaba64d3cde2478ff209b0 100644
--- a/railties/lib/webrick_server.rb
+++ b/railties/lib/webrick_server.rb
@@ -94,6 +94,7 @@ def handle_dispatch(req, res, origin = nil)
       res.status = $1.to_i
       header.delete('status')
     end
+    res.cookies.concat header.delete('set-cookie')
     header.each { |key, val| res[key] = val.join(", ") }
     
     res.body = body