diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 64a1c27a2a..ae5086f43b 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Make webrick work with session(:off)
+
 * Add --version, -v option to the Rails command. Closes #1840. [stancell]
 
 * Update Prototype to V1.4.0_pre11, script.aculo.us to V1.5_rc3 [2504] and fix the rails generator to include the new .js files [Thomas Fuchs]
diff --git a/railties/lib/webrick_server.rb b/railties/lib/webrick_server.rb
index 0b82a99075..734f87f6fd 100644
--- a/railties/lib/webrick_server.rb
+++ b/railties/lib/webrick_server.rb
@@ -117,7 +117,7 @@ class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet
 
     set_charset(header)
     assign_status(res, header)
-    res.cookies.concat(header.delete('set-cookie'))
+    res.cookies.concat(header.delete('set-cookie') || [])
     header.each { |key, val| res[key] = val.join(", ") }
     
     res.body = body