diff --git a/swift/proxy/server.py b/swift/proxy/server.py
index 8485a618da..a00a31f42b 100644
--- a/swift/proxy/server.py
+++ b/swift/proxy/server.py
@@ -632,8 +632,8 @@ class Controller(object):
                 res.status = source.status
                 res.content_length = source.getheader('Content-Length')
                 if source.getheader('Content-Type'):
-                    res.content_type = source.getheader('Content-Type')
                     res.charset = None
+                    res.content_type = source.getheader('Content-Type')
                 return res
             elif 200 <= source.status <= 399:
                 res = status_map[source.status](request=req)
@@ -641,8 +641,8 @@ class Controller(object):
                 if req.method == 'HEAD':
                     res.content_length = source.getheader('Content-Length')
                     if source.getheader('Content-Type'):
-                        res.content_type = source.getheader('Content-Type')
                         res.charset = None
+                        res.content_type = source.getheader('Content-Type')
                 return res
             statuses.append(source.status)
             reasons.append(source.reason)
diff --git a/test/unit/proxy/test_server.py b/test/unit/proxy/test_server.py
index d6e2710ca7..77963fe1b2 100644
--- a/test/unit/proxy/test_server.py
+++ b/test/unit/proxy/test_server.py
@@ -2031,6 +2031,52 @@ class TestObjectController(unittest.TestCase):
                 exp = 'HTTP/1.1 200'
                 self.assertEquals(headers[:len(exp)], exp)
                 self.assert_('Content-Type: text/jibberish' in headers)
+                # Check set content type
+                sock = connect_tcp(('localhost', prolis.getsockname()[1]))
+                fd = sock.makefile()
+                fd.write('PUT /v1/a/c/obj3 HTTP/1.1\r\nHost: '
+                    'localhost\r\nConnection: close\r\nX-Storage-Token: '
+                    't\r\nContent-Length: 0\r\nContent-Type: foo/bar'
+                    '\r\n\r\n')
+                fd.flush()
+                headers = readuntil2crlfs(fd)
+                exp = 'HTTP/1.1 201'
+                self.assertEquals(headers[:len(exp)], exp)
+                # Ensure getting the copied file gets original content-type
+                sock = connect_tcp(('localhost', prolis.getsockname()[1]))
+                fd = sock.makefile()
+                fd.write('GET /v1/a/c/obj3 HTTP/1.1\r\nHost: '
+                    'localhost\r\nConnection: close\r\nX-Auth-Token: '
+                    't\r\n\r\n')
+                fd.flush()
+                headers = readuntil2crlfs(fd)
+                exp = 'HTTP/1.1 200'
+                self.assertEquals(headers[:len(exp)], exp)
+                self.assert_('Content-Type: foo/bar' in
+                             headers.split('\r\n'), repr(headers.split('\r\n')))
+                # Check set content type with charset
+                sock = connect_tcp(('localhost', prolis.getsockname()[1]))
+                fd = sock.makefile()
+                fd.write('PUT /v1/a/c/obj4 HTTP/1.1\r\nHost: '
+                    'localhost\r\nConnection: close\r\nX-Storage-Token: '
+                    't\r\nContent-Length: 0\r\nContent-Type: foo/bar'
+                    '; charset=UTF-8\r\n\r\n')
+                fd.flush()
+                headers = readuntil2crlfs(fd)
+                exp = 'HTTP/1.1 201'
+                self.assertEquals(headers[:len(exp)], exp)
+                # Ensure getting the copied file gets original content-type
+                sock = connect_tcp(('localhost', prolis.getsockname()[1]))
+                fd = sock.makefile()
+                fd.write('GET /v1/a/c/obj4 HTTP/1.1\r\nHost: '
+                    'localhost\r\nConnection: close\r\nX-Auth-Token: '
+                    't\r\n\r\n')
+                fd.flush()
+                headers = readuntil2crlfs(fd)
+                exp = 'HTTP/1.1 200'
+                self.assertEquals(headers[:len(exp)], exp)
+                self.assert_('Content-Type: foo/bar; charset=UTF-8' in
+                             headers.split('\r\n'), repr(headers.split('\r\n')))
             finally:
                 prospa.kill()
                 acc1spa.kill()