diff --git a/lib/storage-handler.js b/lib/storage-handler.js
index e0dabc6..ebdaa8d 100644
--- a/lib/storage-handler.js
+++ b/lib/storage-handler.js
@@ -68,6 +68,7 @@ exports.upload = function(provider, req, res, options, cb) {
 
     // Build a filename
     if ('function' === typeof options.getFilename) {
+      file.originalFilename = file.name;
       file.name = options.getFilename(file, req, res);
     }
 
diff --git a/test/upload-download.test.js b/test/upload-download.test.js
index edf705e..e592994 100644
--- a/test/upload-download.test.js
+++ b/test/upload-download.test.js
@@ -179,7 +179,7 @@ describe('storage service', function () {
       .expect('Content-Type', /json/)
       .expect(200, function (err, res) {
         assert.deepEqual(res.body, {"result": {"files": {"image": [
-          {"container": "album1", "name": "image-test.jpg", "type": "image/jpeg", "acl":"public-read", "size": 60475}
+          {"container": "album1", "name": "image-test.jpg", "originalFilename":"test.jpg", "type": "image/jpeg", "acl":"public-read", "size": 60475}
         ]}, "fields": {}}});
         done();
       });