diff --git a/package.json b/package.json
index 38a0fc3..dd8c860 100644
--- a/package.json
+++ b/package.json
@@ -13,9 +13,9 @@
     "build": "npm run test && npm run clean && npm run lint-js && npm run build-es5 && npm run build-webpack",
     "build-doc": "jsdoc  --package package.json -d doc ./src/**/*.js",
     "build-es5": "babel src --out-dir lib ",
-    "build-webpack": "webpack --progress --colors --display-error-details",
+    "build-webpack": "webpack -p --progress --colors --display-error-details",
     "clean": "rm -rf dist lib doc",
-    "dev": "webpack-dev-server --host=0.0.0.0 --inline --config webpack.config.dev.js",
+    "dev": "webpack-dev-server --config webpack.config.dev.js",
     "lint-js": "eslint 'src/**/*.js' --fix",
     "test": "mocha --compilers js:babel-core/register --recursive"
   },
@@ -41,8 +41,8 @@
     "matchdep": "^1.0.1",
     "mocha": "^3.1.0",
     "sinon": "^1.17.6",
-    "webpack": "^1.13.0",
-    "webpack-dev-server": "^1.14.1"
+    "webpack": "^2.5.1",
+    "webpack-dev-server": "^2.4.5"
   },
   "repository": {
     "type": "git",
diff --git a/webpack.config.dev.js b/webpack.config.dev.js
index 2b72eea..b74853d 100644
--- a/webpack.config.dev.js
+++ b/webpack.config.dev.js
@@ -1,29 +1,32 @@
-var path = require("path"),
-    webpack = require("webpack"),
-    pkg = require("./package.json");
+const path = require('path');
+const webpack = require('webpack');
+const pkg = require('./package.json');
 
 module.exports = {
   entry: {
-    "xfc": ["babel-polyfill", "./src"],
+    xfc: ['babel-polyfill', './src'],
   },
   output: {
-    path: "./dist/",
-    filename: "xfc.js",
+    filename: 'xfc.js',
     libraryTarget: 'umd',
-    library: 'XFC'
+    library: 'XFC',
   },
   module: {
-    loaders: [
+    rules: [
       {
         test: /\.js$/,
-        include: /src|index\.js/,
-        loader: 'babel-loader',
-        query: {
-          presets: ["es2015"],
-        }
-      }
-    ]
+        include: path.resolve(__dirname, 'src'),
+        use: [
+          {
+            loader: 'babel-loader',
+          },
+        ],
+      },
+    ],
   },
-  devtool: "sourcemap",
-  debug: true
+  devServer: {
+    host: '0.0.0.0',
+    disableHostCheck: true,
+  },
+  devtool: 'cheap-eval-source-map',
 };
diff --git a/webpack.config.js b/webpack.config.js
index af2b93d..983a97e 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,34 +1,29 @@
-var path = require("path"),
-    webpack = require("webpack"),
-    pkg = require("./package.json");
+const path = require('path');
+const webpack = require('webpack');
+const pkg = require('./package.json');
 
 module.exports = {
   entry: {
-    "xfc": ["./src"],
+    xfc: ['./src'],
   },
   output: {
-    path: "./dist/",
-    filename: "xfc.js",
+    path: path.resolve(__dirname, 'dist'),
+    filename: 'xfc.js',
     libraryTarget: 'umd',
-    library: 'XFC'
+    library: 'XFC',
   },
   module: {
-    loaders: [
+    rules: [
       {
         test: /\.js$/,
-        include: /src|index\.js/,
-        loader: 'babel-loader',
-        query: {
-          presets: ["es2015"],
-        }
-      }
-    ]
+        include: path.resolve(__dirname, 'src'),
+        use: [
+          {
+            loader: 'babel-loader',
+          },
+        ],
+      },
+    ],
   },
-  devtool: "sourcemap",
-  plugins: [
-    new webpack.optimize.DedupePlugin({
-      'process.env.NODE_ENV': JSON.stringify('production')
-    }),
-    new webpack.optimize.UglifyJsPlugin()
-  ]
+  devtool: 'source-map',
 };