diff --git a/lib/fishwife/rack_servlet.rb b/lib/fishwife/rack_servlet.rb
index 8ce99aa..4a454e5 100644
--- a/lib/fishwife/rack_servlet.rb
+++ b/lib/fishwife/rack_servlet.rb
@@ -205,7 +205,8 @@ def rack_to_servlet(rack_response, response)
         response.setContentType(content_type) if content_type
 
         # Add all the result headers.
-        headers.each { |h, v| response.addHeader(h, v) }
+        headers.each { |h, v| v.split("\n").each { |val|
+          response.addHeader(h, val) } }
       end
 
       # How else would we write output?