diff --git a/package.json b/package.json
index 463d462c..3363b0bc 100644
--- a/package.json
+++ b/package.json
@@ -54,6 +54,7 @@
     "babel-core": "^6.26.3",
     "babel-loader": "^7.1.4",
     "babel-plugin-transform-runtime": "^6.23.0",
+    "babel-polyfill": "^6.26.0",
     "babel-preset-env": "^1.7.0",
     "babelify": "^8.0.0",
     "browserify": "^16.2.2",
@@ -85,10 +86,10 @@
     "test-file": "mocha --reporter spec",
     "test-file-browser": "NODE_BACKEND=js mocha --reporter spec",
     "test-ci": "istanbul cover node_modules/.bin/_mocha --report lcovonly -- --reporter spec test/*.js",
-    "webpack": "webpack --config webpack.browser.js",
-    "webpack-browser": "webpack --config webpack.browser.js",
-    "webpack-compat": "webpack --config webpack.compat.js",
-    "webpack-app": "webpack --config webpack.app.js"
+    "webpack": "webpack --mode production --config webpack.browser.js",
+    "webpack-browser": "webpack --mode production --config webpack.browser.js",
+    "webpack-compat": "webpack --mode production --config webpack.compat.js",
+    "webpack-app": "webpack --mode production --config webpack.app.js"
   },
   "browser": {
     "./lib/hd/nfkd": "./lib/hd/nfkd-compat.js",
diff --git a/webpack.app.js b/webpack.app.js
index db860174..e32b62da 100644
--- a/webpack.app.js
+++ b/webpack.app.js
@@ -18,7 +18,8 @@ module.exports = {
   },
   resolve: {
     modules: ['node_modules'],
-    extensions: ['-browser.js', '.js', '.json']
+    extensions: ['-browser.js', '.js', '.json'],
+    alias: require('bcrypto/compat')
   },
   plugins: [
     new webpack.DefinePlugin({
diff --git a/webpack.browser.js b/webpack.browser.js
index 5a8eeb11..1a5c37fe 100644
--- a/webpack.browser.js
+++ b/webpack.browser.js
@@ -20,7 +20,8 @@ module.exports = {
   },
   resolve: {
     modules: ['node_modules'],
-    extensions: ['-browser.js', '.js', '.json']
+    extensions: ['-browser.js', '.js', '.json'],
+    alias: require('bcrypto/compat')
   },
   plugins: [
     new webpack.DefinePlugin({
diff --git a/webpack.compat.js b/webpack.compat.js
index 18a54205..e12d66e1 100644
--- a/webpack.compat.js
+++ b/webpack.compat.js
@@ -20,7 +20,8 @@ module.exports = {
   },
   resolve: {
     modules: ['node_modules'],
-    extensions: ['-compat.js', '-browser.js', '.js', '.json']
+    extensions: ['-compat.js', '-browser.js', '.js', '.json'],
+    alias: require('bcrypto/compat')
   },
   module: {
     rules: [{