diff --git a/swift/common/swob.py b/swift/common/swob.py
index 1a02740031..a64c4cf6d1 100644
--- a/swift/common/swob.py
+++ b/swift/common/swob.py
@@ -1184,7 +1184,7 @@ class Response(object):
         """
 
         content_size = self.content_length
-        content_type = self.content_type
+        content_type = self.headers.get('content-type')
         self.content_type = ''.join(['multipart/byteranges;',
                                      'boundary=', self.boundary])
 
diff --git a/test/unit/common/test_swob.py b/test/unit/common/test_swob.py
index 489fa1dd28..8a0b21fd25 100644
--- a/test/unit/common/test_swob.py
+++ b/test/unit/common/test_swob.py
@@ -1228,21 +1228,21 @@ class TestResponse(unittest.TestCase):
         resp.conditional_response = True
         resp.content_length = 100
 
-        resp.content_type = 'text/plain'
+        resp.content_type = 'text/plain; charset=utf8'
         content = ''.join(resp._response_iter(None,
                                               ('0123456789112345678'
                                                '92123456789')))
 
         self.assertTrue(re.match(('--[a-f0-9]{32}\r\n'
-                                  'Content-Type: text/plain\r\n'
+                                  'Content-Type: text/plain; charset=utf8\r\n'
                                   'Content-Range: bytes '
                                   '0-9/100\r\n\r\n0123456789\r\n'
                                   '--[a-f0-9]{32}\r\n'
-                                  'Content-Type: text/plain\r\n'
+                                  'Content-Type: text/plain; charset=utf8\r\n'
                                   'Content-Range: bytes '
                                   '10-19/100\r\n\r\n1123456789\r\n'
                                   '--[a-f0-9]{32}\r\n'
-                                  'Content-Type: text/plain\r\n'
+                                  'Content-Type: text/plain; charset=utf8\r\n'
                                   'Content-Range: bytes '
                                   '20-29/100\r\n\r\n2123456789\r\n'
                                   '--[a-f0-9]{32}--'), content))