diff --git a/package.json b/package.json
index 073643e..ccb0d08 100644
--- a/package.json
+++ b/package.json
@@ -17,10 +17,10 @@
     "test": "npm run test:node && npm run test:no-webcrypto && npm run test:browser",
     "test:node": "aegir-test --env node",
     "test:no-webcrypto": "NO_WEBCRYPTO=true aegir-test --env node",
-    "test:browser": "aegir-test --env browser",
-    "release": "aegir-release",
-    "release-minor": "aegir-release --type minor",
-    "release-major": "aegir-release --type major",
+    "test:browser": "aegir-test --env browser --webworker",
+    "release": "aegir-release --webworker",
+    "release-minor": "aegir-release --type minor --webworker",
+    "release-major": "aegir-release --type major --webworker",
     "coverage": "aegir-coverage",
     "coverage-publish": "aegir-coverage publish"
   },
@@ -33,11 +33,11 @@
   "author": "Friedel Ziegelmayer <dignifiedqurie@gmail.com>",
   "license": "MIT",
   "dependencies": {
-    "asn1.js": "^4.8.1",
-    "async": "^2.1.2",
+    "asn1.js": "^4.9.1",
+    "async": "^2.1.4",
     "browserify-aes": "^1.0.6",
-    "keypair": "^1.0.0",
-    "multihashing-async": "^0.3.0",
+    "keypair": "^1.0.1",
+    "multihashing-async": "^0.4.0",
     "nodeify": "^1.0.0",
     "pem-jwk": "^1.5.1",
     "protocol-buffers": "^3.2.1",
@@ -47,13 +47,13 @@
     "webcrypto-shim": "github:dignifiedquire/webcrypto-shim#master"
   },
   "devDependencies": {
-    "aegir": "^9.2.1",
-    "benchmark": "^2.1.2",
+    "aegir": "^9.4.0",
+    "benchmark": "^2.1.3",
     "chai": "^3.5.0",
-    "pre-commit": "^1.1.3"
+    "pre-commit": "^1.2.2"
   },
   "optionalDependencies": {
-    "node-webcrypto-ossl": "^1.0.15"
+    "node-webcrypto-ossl": "^1.0.16"
   },
   "pre-commit": [
     "lint",
@@ -78,4 +78,4 @@
     "Yusef Napora <yusef@napora.org>",
     "nikuda <nikuda@gmail.com>"
   ]
-}
\ No newline at end of file
+}
diff --git a/src/crypto/webcrypto-browser.js b/src/crypto/webcrypto-browser.js
index d0899c3..3848ae2 100644
--- a/src/crypto/webcrypto-browser.js
+++ b/src/crypto/webcrypto-browser.js
@@ -1,3 +1,5 @@
+/* global self */
+
 'use strict'
 
 module.exports = function getWebCrypto () {
@@ -10,5 +12,13 @@ module.exports = function getWebCrypto () {
     }
   }
 
+  if (typeof self !== 'undefined') {
+    require('webcrypto-shim')(self)
+
+    if (self.crypto) {
+      return self.crypto
+    }
+  }
+
   throw new Error('Please use an environment with crypto support')
 }