diff --git a/gulpfile.js b/gulpfile.js
index 7b6fa5e8..819846a7 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,16 +1,17 @@
-var gulp = require('gulp'),
-    browserSync = require('browser-sync').create(),
-    args = require('yargs').argv,
-    gulpif = require('gulp-if'),
-    sass = require('gulp-sass'),
-    sourcemaps = require('gulp-sourcemaps');
+var gulp = require('gulp');
+var browserSync = require('browser-sync').create();
+var args = require('yargs').argv;
+var gulpif = require('gulp-if');
+var sass = require('gulp-sass');
+var sourcemaps = require('gulp-sourcemaps');
+var webpackStream = require('webpack-stream');
 
 var paths = {
   sassAll: 'sass/**/*.scss',
   cssDest: 'css'
 }
 
-gulp.task('serve', function() {
+gulp.task('serve', function () {
   browserSync.init({
     server: {
       baseDir: "./"
@@ -20,16 +21,22 @@ gulp.task('serve', function() {
   gulp.watch(['*.html', '*.css', '*.js']).on('change', browserSync.reload);
 });
 
-gulp.task('sass', function() {
+gulp.task('sass', function () {
   return gulp.src(paths.sassAll)
-  .pipe(gulpif(args.debug, sourcemaps.init()))
-  .pipe(sass().on('error', sass.logError))
-  .pipe(gulpif(args.debug, sourcemaps.write()))
-  .pipe(gulp.dest(paths.cssDest));
+    .pipe(gulpif(args.debug, sourcemaps.init()))
+    .pipe(sass().on('error', sass.logError))
+    .pipe(gulpif(args.debug, sourcemaps.write()))
+    .pipe(gulp.dest(paths.cssDest));
 });
 
-gulp.task('watch', function() {
+gulp.task('watch', function () {
   gulp.watch(paths.sassAll, ['sass']);
 });
 
-gulp.task('default', ['sass']);
+gulp.task('webpack', function () {
+  return gulp.src('./src/boot.ts')
+    .pipe(webpackStream(require('./webpack.config.js')))
+    .pipe(gulp.dest('build/'));
+});
+
+gulp.task('default', ['sass', 'webpack']);
diff --git a/package.json b/package.json
index 3ce7db94..8551aa8c 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "typings": "^0.8.1",
     "webpack": "^1.13.0",
     "webpack-dev-server": "^1.14.1",
+    "webpack-stream": "^3.2.0",
     "webpack-svgstore-plugin": "^2.1.5",
     "yargs": "^4.2.0"
   },
@@ -46,7 +47,7 @@
     "postinstall": "typings install",
     "lint": "tslint 'src/**/*.ts' 'config-serializer/**/*.ts'",
     "typings": "typings",
-    "build": "webpack",
+    "build": "gulp",
     "build:test": "webpack --config 'config-serializer/webpack.config.js'",
     "webpack": "webpack",
     "webpack-dev-server": "webpack-dev-server"