diff --git a/gulp/webpack.js b/gulp/webpack.js
index c5f23df9d..64570593c 100644
--- a/gulp/webpack.js
+++ b/gulp/webpack.js
@@ -1,9 +1,7 @@
 var gulp = require('gulp');
 var webpackStream = require('webpack-stream');
 var livereload = require('gulp-livereload');
-
 var webpackConfig = require('../webpack.config');
-webpackConfig.devtool = "#source-map";
 
 gulp.task('webpack', function() {
     return gulp.src('main.js').pipe(webpackStream(webpackConfig)).pipe(gulp.dest(''));
diff --git a/webpack.config.js b/webpack.config.js
index 7a7117f4c..aee88a18a 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -14,6 +14,8 @@ if (phantom) {
 }
 
 module.exports = {
+  devtool : '#source-map',
+  watchOptions : { poll: true },
   entry: {
     vendor: 'vendor.js',
     main: 'main.js'
@@ -65,7 +67,7 @@ module.exports = {
   ],
   module: {
 
-    //this doesn't work yet. wainting for https://github.com/spenceralger/rcloader/issues/5
+    //this doesn't work yet. waiting for https://github.com/spenceralger/rcloader/issues/5
     /*preLoaders: [
         {
             test: /\.js$/, // include .js files