diff --git a/package.json b/package.json
index da98526..34088f1 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "test": "jasmine JASMINE_CONFIG_PATH=test/unit/jasmine.json",
     "lint": "eslint ./",
     "prepublish": "nsp check; npm run build",
-    "build": "babel src -d dist",
+    "build": "babel src -d dist && webpack",
     "doc": "(cd ./doc && make html)"
   },
   "repository": {
@@ -27,12 +27,14 @@
   "devDependencies": {
     "babel-cli": "^6.10.1",
     "babel-core": "^6.10.4",
+    "babel-loader": "^6.2.4",
     "babel-preset-es2015": "^6.9.0",
     "babel-register": "^6.9.0",
     "eslint": "^2.4.0",
     "eslint-config-openstack": "2.0.0",
     "jasmine": "^2.4.1",
-    "nsp": "^2.4.0"
+    "nsp": "^2.4.0",
+    "webpack": "^1.13.1"
   },
   "files": [
     "dist"
diff --git a/webpack.config.babel.js b/webpack.config.babel.js
new file mode 100644
index 0000000..d33cd20
--- /dev/null
+++ b/webpack.config.babel.js
@@ -0,0 +1,18 @@
+export default {
+  entry: ['./src/index.js'],
+  output: {
+    path: './dist',
+    filename: 'js-openstack-lib.js',
+    library: 'JSOpenStackLib',
+    libraryTarget: 'umd'
+  },
+  module: {
+    loaders: [
+      {
+        test: /\.js$/,
+        loader: 'babel',
+        exclude: /node_modules/
+      }
+    ]
+  }
+};