diff --git a/index.html b/index.html
index 26198ae..c17e1c5 100755
--- a/index.html
+++ b/index.html
@@ -46,6 +46,6 @@
     <script src="src/view.js"></script>
     <script src="src/controller.js"></script>
     <script src="src/app.js"></script>
-    <script src="src/bootstrap.js"></script>
+    <script src="dist/bundle.js"></script>
   </body>
 </html>
diff --git a/package.json b/package.json
index e3a0219..3573787 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,13 @@
     "eslint-config-kentcdodds": "^9.0.0",
     "ghooks": "1.3.2",
     "http-server": "0.9.0",
-    "opt-cli": "1.5.1"
+    "npm-run-all": "2.3.0",
+    "opt-cli": "1.5.1",
+    "rimraf": "2.5.4",
+    "webpack": "2.1.0-beta.20",
+    "webpack-config-utils": "2.0.0",
+    "webpack-dev-server": "2.1.0-beta.0",
+    "webpack-validator": "2.2.7"
   },
   "config": {
     "ghooks": {
@@ -16,8 +22,13 @@
     }
   },
   "scripts": {
-    "validate": "npm run lint",
-    "start": "http-server --silent -c-1",
+    "prebuild": "rimraf dist",
+    "build": "webpack --env.prod -p",
+    "prebuild:dev": "rimraf dist",
+    "build:dev": "webpack --env.dev",
+    "start": "http-server",
+    "dev": "webpack-dev-server --env.dev",
+    "validate": "npm-run-all --parallel lint build",
     "lint": "eslint ."
   }
 }
diff --git a/webpack.config.babel.js b/webpack.config.babel.js
new file mode 100644
index 0000000..eea0e5d
--- /dev/null
+++ b/webpack.config.babel.js
@@ -0,0 +1,17 @@
+const {resolve} = require('path')
+const webpackValidator = require('webpack-validator')
+const {getIfUtils} = require('webpack-config-utils')
+
+module.exports = env => {
+  const {ifProd} = getIfUtils(env)
+  return webpackValidator({
+    context: resolve('src'),
+    entry: './bootstrap.js',
+    output: {
+      filename: 'bundle.js',
+      path: resolve('dist'),
+      publicPath: '/dist/',
+    },
+    devtool: ifProd('source-map', 'eval'),
+  })
+}