diff --git a/admin/server/api/s3.js b/admin/server/api/s3.js
index b4009fa62e..12e7051837 100644
--- a/admin/server/api/s3.js
+++ b/admin/server/api/s3.js
@@ -5,7 +5,7 @@ TODO: Needs Review and Spec
 module.exports = {
 
 	upload: function (req, res) {
-		var knox = require('knox');
+		var knox = require('knox-s3');
 		var keystone = req.keystone;
 		var Types = keystone.Field.Types;
 
diff --git a/fields/types/s3file/S3FileType.js b/fields/types/s3file/S3FileType.js
index e38eaee147..90ac8b0222 100644
--- a/fields/types/s3file/S3FileType.js
+++ b/fields/types/s3file/S3FileType.js
@@ -68,7 +68,7 @@ Object.defineProperty(s3file.prototype, 's3config', {
  */
 s3file.prototype.addToSchema = function (schema) {
 
-	var knox = require('knox');
+	var knox = require('knox-s3');
 	var field = this;
 
 	var paths = this.paths = {
@@ -333,7 +333,7 @@ s3file.prototype.generateHeaders = function (item, file, callback) {
  */
 s3file.prototype.uploadFile = function (item, file, update, callback) {
 
-	var knox = require('knox');
+	var knox = require('knox-s3');
 	var field = this;
 	var path = field.options.s3path ? field.options.s3path + '/' : '';
 	var prefix = field.options.datePrefix ? moment().format(field.options.datePrefix) + '-' : '';
diff --git a/package.json b/package.json
index c5c4fa65aa..e31c3ed1e7 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "kerberos": "0.0.22",
     "keystone-storage-namefunctions": "1.1.1",
     "keystone-utils": "0.4.0",
-    "knox": "0.9.2",
+    "knox-s3": "0.9.5",
     "less-middleware": "2.2.0",
     "letsencrypt-express": "2.0.6",
     "list-to-array": "1.1.0",