diff --git a/package.json b/package.json
index c1c1478..6834aab 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,8 @@
   "scripts": {
     "test": "ava tests/*.test.js --tap | tap-nyan",
     "start": "node example/server/default.js",
-    "build": "webpack && npm run dev && bower i",
+    "build": "npm run bundle && npm run dev && bower i",
+    "bundle": "rollup -c rollup.config.js",
     "cleanup": "rimraf node_modules",
     "dev": "browserify example/js/default.js -o example/js/build.js -t [ babelify --presets [ es2015 react stage-0 ] ] && node-sass example/sass/default.scss example/css/default.css && node-sass example/sass/components/add-todo.scss example/css/components/add-todo.css && node-sass example/sass/components/list-todos.scss example/css/components/list-todos.css && node-sass example/sass/components/filter-todos.scss example/css/components/filter-todos.css"
   },
@@ -42,9 +43,9 @@
   "devDependencies": {
     "array-shuffle": "^1.0.0",
     "ava": "git+https://github.com/sindresorhus/ava.git",
-    "babel-loader": "^6.2.4",
     "babel-polyfill": "^6.7.4",
     "babel-preset-es2015": "^6.6.0",
+    "babel-preset-es2015-rollup": "^1.1.1",
     "babel-preset-react": "^6.5.0",
     "babel-preset-stage-0": "^6.5.0",
     "babel-register": "^6.6.5",
@@ -57,7 +58,6 @@
     "express": "^4.13.4",
     "is-empty-object": "^1.1.1",
     "is-symbol": "^1.0.1",
-    "json-loader": "^0.5.4",
     "node-fetch": "^1.3.3",
     "node-sass": "^3.4.2",
     "object-hash": "^1.1.2",
@@ -68,11 +68,12 @@
     "redux-mock-store": "^1.0.2",
     "redux-thunk": "^2.0.1",
     "rimraf": "^2.5.2",
+    "rollup": "^0.26.0",
+    "rollup-plugin-babel": "^2.4.0",
     "seamless-immutable": "^5.1.0",
     "sinon": "^1.17.3",
     "tap-nyan": "0.0.2",
     "unique-random-array": "^1.0.0",
-    "webpack": "^2.1.0-beta.4",
     "whatwg-fetch": "^0.11.0"
   },
   "dependencies": {
diff --git a/rollup.config.js b/rollup.config.js
new file mode 100644
index 0000000..a37f289
--- /dev/null
+++ b/rollup.config.js
@@ -0,0 +1,13 @@
+'use strict';
+
+var rollup = require('rollup').rollup;
+var babel = require('rollup-plugin-babel');
+
+module.exports = {
+	entry: 'src/keo.js',
+	format: 'cjs',
+	plugins: [
+		babel()
+	],
+	dest: 'dist/keo.js'
+};
diff --git a/src/.babelrc b/src/.babelrc
new file mode 100644
index 0000000..ff7fe1e
--- /dev/null
+++ b/src/.babelrc
@@ -0,0 +1,7 @@
+{
+  "presets": [
+    "es2015-rollup",
+    "stage-0",
+    "react"
+  ]
+}
diff --git a/webpack.config.js b/webpack.config.js
deleted file mode 100644
index 1d5a6dd..0000000
--- a/webpack.config.js
+++ /dev/null
@@ -1,30 +0,0 @@
-var webpack = require('webpack');
-require('babel-loader');
-require('json-loader');
-
-module.exports = {
-    entry: {
-        keo: ['./src/keo.js']
-    },
-    output: {
-        path: __dirname + '/dist',
-        filename: '[name].js',
-	    library: 'keo',
-        libraryTarget: 'commonjs2'
-    },
-    module: {
-        loaders: [
-            {
-                test: /\.js$/,
-                loader: 'babel-loader',
-                query: {
-                  presets: ['es2015', 'stage-0']
-                }
-            },
-            {
-                test: /\.json$/,
-                loader: 'json-loader'
-            }
-        ]
-    }
-};