diff --git a/swift/common/middleware/swift3.py b/swift/common/middleware/swift3.py
index 5f7159c47c..c3e1b7fb5c 100644
--- a/swift/common/middleware/swift3.py
+++ b/swift/common/middleware/swift3.py
@@ -166,8 +166,7 @@ class BucketController(Controller):
                            for i in objects[:max_keys] if 'subdir' not in i]),
                 "".join(['<CommonPrefixes><Prefix>%s</Prefix></CommonPrefixes>'
                          % xml_escape(i['subdir'])
-                         for i in objects[:max_keys] if 'subdir' in i])
-            ))
+                         for i in objects[:max_keys] if 'subdir' in i])))
         return Response(body=body, content_type='text/xml')
 
     def PUT(self, env, start_response):
@@ -246,6 +245,15 @@ class ObjectController(Controller):
         return self.GETorHEAD(env, start_response)
 
     def PUT(self, env, start_response):
+        for key, value in env.items():
+            if key.startswith('HTTP_X_AMZ_META_'):
+                del env[key]
+                env['HTTP_X_OBJECT_META_' + key[16:]] = value
+            elif key == 'HTTP_CONTENT_MD5':
+                env['HTTP_ETAG'] = value.decode('base64').encode('hex')
+            elif key == 'HTTP_X_AMZ_COPY_SOURCE':
+                env['HTTP_X_OBJECT_COPY'] = value
+
         body_iter = self.app(env, self.do_start_response)
         status = int(self.response_args[0].split()[0])
         headers = dict(self.response_args[1])
@@ -258,10 +266,9 @@ class ObjectController(Controller):
             else:
                 return get_err_response('InvalidURI')
 
-        resp = Response()
-        resp.etag = headers['etag']
-        resp.status = 200
-        return resp
+        etag = headers['etag']
+        del headers['etag']
+        return Response(status=200, headers=headers, etag=etag)
 
     def DELETE(self, env, start_response):
         body_iter = self.app(env, self.do_start_response)
diff --git a/test/unit/common/middleware/test_swift3.py b/test/unit/common/middleware/test_swift3.py
index 528c05f7f2..c7c974c965 100644
--- a/test/unit/common/middleware/test_swift3.py
+++ b/test/unit/common/middleware/test_swift3.py
@@ -470,7 +470,7 @@ class TestSwift3(unittest.TestCase):
                             environ={'REQUEST_METHOD': 'PUT'},
                             headers={'Authorization': 'AUTH_who:password',
                                      'x-amz-storage-class': 'REDUCED_REDUNDANCY',
-                                     'Content-MD5': '1b2cf535f27731c974343645a3985328'})
+                                     'Content-MD5': 'Gyz1NfJ3Mcl0NDZFo5hTKA=='})
         req.date = datetime.now()
         req.content_type = 'text/plain'
         resp = local_app(req.environ, local_app.app.do_start_response)
@@ -480,6 +480,29 @@ class TestSwift3(unittest.TestCase):
         self.assertEquals(headers['ETag'],
                           "\"%s\"" % local_app.app.response_headers['etag'])
 
+    def test_object_PUT_headers(self):
+        class FakeApp(object):
+            def __call__(self, env, start_response):
+                self.req = Request(env)
+                start_response('200 OK')
+                start_response([])
+        app = FakeApp()
+        local_app = swift3.filter_factory({})(app)
+        req = Request.blank('/bucket/object',
+                        environ={'REQUEST_METHOD': 'PUT'},
+                        headers={'Authorization': 'AUTH_who:password',
+                                 'X-Amz-Storage-Class': 'REDUCED_REDUNDANCY',
+                                 'X-Amz-Meta-Something': 'oh hai',
+                                 'X-Amz-Copy-Source': '/some/source',
+                                 'Content-MD5': 'ffoHqOWd280dyE1MT4KuoQ=='})
+        req.date = datetime.now()
+        req.content_type = 'text/plain'
+        resp = local_app(req.environ, lambda *args: None)
+        self.assertEquals(app.req.headers['ETag'],
+                    '7dfa07a8e59ddbcd1dc84d4c4f82aea1')
+        self.assertEquals(app.req.headers['X-Object-Meta-Something'], 'oh hai')
+        self.assertEquals(app.req.headers['X-Object-Copy'], '/some/source')
+
     def test_object_DELETE_error(self):
         code = self._test_method_error(FakeAppObject, 'DELETE',
                                        '/bucket/object', 401)