diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1bdf7177..a47e3ac36 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,12 @@
 ## CHANGELOG
 
+## v2.2.0
+
+- [#678] [@jcrugzz] support more aws auth scenarios via credentials object or sessionToken.
+
 ## v2.1.1
 
-- [#666], [@guischdi] Fix GCS upload. 
+- [#666], [@guischdi] Fix GCS upload.
 
 ## v2.1.0
 
@@ -32,9 +36,9 @@
 ## v1.5.0
 
 - Added 1&1 support with tests.
-- Set Content-Type with Google storage. Fixes [#635]. 
+- Set Content-Type with Google storage. Fixes [#635].
 - Attempt to restrict to `node@6` and `node@8`.
-- [fix] Patched RegEx DoS vuln & Remote Memory Exposure vuln. 
+- [fix] Patched RegEx DoS vuln & Remote Memory Exposure vuln.
   This addresses two major security issues:
    - https://nodesecurity.io/advisories/309
    - https://nodesecurity.io/advisories/535
diff --git a/lib/pkgcloud/amazon/client.js b/lib/pkgcloud/amazon/client.js
index 6b756db79..e6786ea8f 100644
--- a/lib/pkgcloud/amazon/client.js
+++ b/lib/pkgcloud/amazon/client.js
@@ -33,7 +33,9 @@ var Client = exports.Client = function (options) {
     accessKeyId: this.config.keyId,
     secretAccessKey: this.config.key,
     region: options.region,
-    s3ForcePathStyle: options.forcePathBucket
+    s3ForcePathStyle: options.forcePathBucket,
+    sessionToken: options.sessionToken,
+    credentials: options.credentials
   };
 
   // TODO think about a proxy option for pkgcloud
diff --git a/lib/pkgcloud/openstack/storage/client/files.js b/lib/pkgcloud/openstack/storage/client/files.js
index c29387137..20d8304af 100644
--- a/lib/pkgcloud/openstack/storage/client/files.js
+++ b/lib/pkgcloud/openstack/storage/client/files.js
@@ -146,9 +146,7 @@ exports.upload = function (options) {
     proxyStream.emit('error', err);
   });
 
-  writableStream.on('data', function (chunk) {
-    proxyStream.emit('data', chunk);
-  });
+
 
   // we need a proxy stream so we can always return a file model
   // via the 'success' event
diff --git a/package-lock.json b/package-lock.json
index bcfb2b49b..e6d06e53f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "pkgcloud",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 1210712e3..2c03de143 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "pkgcloud",
   "description": "A provider agnostic cloud library for Node.js",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "author": "Charlie Robbins <charlie.robbins@gmail.com>",
   "contributors": [
     "Ross Kukulinski <ross@kukulinski.com>",
@@ -40,7 +40,7 @@
     "fast-json-patch": "^2.1.0",
     "filed-mimefix": "^0.1.3",
     "ip": "^1.1.5",
-    "liboneandone": "^1.2.0",
+    "liboneandone-2": "^1.0.0",
     "lodash": "^4.17.10",
     "mime": "^2.4.1",
     "qs": "^6.5.2",