diff --git a/webpack.config.jsdelivr.babel.js b/webpack.config.jsdelivr.babel.js
index 5bd9985e..3055c9d3 100644
--- a/webpack.config.jsdelivr.babel.js
+++ b/webpack.config.jsdelivr.babel.js
@@ -1,3 +1,6 @@
+import webpack from 'webpack';
+import {join} from 'path';
+
 export default {
   entry: './index.js',
   devtool: 'source-map',
@@ -12,6 +15,18 @@ export default {
       test: /\.js$/, exclude: /node_modules/, loader: 'babel'
     }]
   },
-  externals: [],
-  plugins: []
+  resolve: {
+    fallback: [join(__dirname, '..', 'node_modules')]
+  },
+  // same issue, for loaders like babel
+  resolveLoader: {
+    fallback: [join(__dirname, '..', 'node_modules')]
+  },
+  plugins: [
+    new webpack.DefinePlugin({
+      'process.env': {
+        NODE_ENV: JSON.stringify(process.env.NODE_ENV)
+      }
+    })
+  ]
 };
diff --git a/webpack.dev.config.babel.js b/webpack.dev.config.babel.js
index 7b7fe43c..f9ed4e1d 100644
--- a/webpack.dev.config.babel.js
+++ b/webpack.dev.config.babel.js
@@ -1,3 +1,5 @@
+import {join} from 'path';
+
 export default {
   entry: './dev/app.js',
   devtool: 'source-map',
@@ -14,5 +16,15 @@ export default {
     contentBase: 'dev/',
     host: '0.0.0.0',
     compress: true
-  }
+  },
+  // when module not found, find locally first
+  // helps fixing the npm link not working with webpack
+  // http://stackoverflow.com/a/33722844/147079
+  resolve: {
+    fallback: [join(__dirname, '..', 'node_modules')]
+  },
+  // same issue, for loaders like babel
+  resolveLoader: {
+    fallback: [join(__dirname, '..', 'node_modules')]
+  },
 };