diff --git a/gulpfile.js b/gulpfile.js
index e7005de..0e2e1f2 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -4,6 +4,17 @@ var gutil = require('gulp-util')
 var shell = require('gulp-shell')
 var mkdirp = require('mkdirp')
 var webpack = require('webpack')
+var browserSync = require('browser-sync').create()
+
+var WATCH = 'watch'
+var WATCHING = process.argv[2] === WATCH
+
+if (WATCHING) {
+  gutil.log('Watching src/*.')
+  gutil.log('The bundle ./dist/jsoneditor.js will be updated automatically  ')
+  gutil.log('on changes in the source code this bundle will not be minified.')
+  gutil.log('Also, ./dist/minimalist code is not updated on changes.')
+}
 
 var NAME    = 'jsoneditor'
 var NAME_MINIMALIST = 'jsoneditor-minimalist'
@@ -35,6 +46,10 @@ var loaders = [
 ]
 
 // create a single instance of the compiler to allow caching
+var plugins = [bannerPlugin]
+if (!WATCHING) {
+  plugins.push(new webpack.optimize.UglifyJsPlugin())
+}
 var compiler = webpack({
   entry: ENTRY,
   devtool: 'source-map',
@@ -46,10 +61,7 @@ var compiler = webpack({
     path: DIST,
     filename: NAME + '.js'
   },
-  plugins: [
-    bannerPlugin,
-    new webpack.optimize.UglifyJsPlugin()   // TODO: don't minify when watching
-  ],
+  plugins: plugins,
   module: {
     loaders: loaders
   },
@@ -71,7 +83,7 @@ var compilerMinimalist = webpack({
     bannerPlugin,
     new webpack.NormalModuleReplacementPlugin(new RegExp('^brace$'), EMPTY),
     new webpack.NormalModuleReplacementPlugin(new RegExp('^ajv'), EMPTY),
-    new webpack.optimize.UglifyJsPlugin()   // TODO: don't minify when watching
+    new webpack.optimize.UglifyJsPlugin()
   ],
   module: {
     loaders: loaders
@@ -131,13 +143,25 @@ gulp.task('zip', shell.task([
       'zip ' + pkg + ' ' + 'README.md LICENSE HISTORY.md index.html src dist docs examples -r '
 ]))
 
+// execute all tasks and reload the browser afterwards
+gulp.task('bundle-and-reload', ['bundle'], function (done) {
+  browserSync.reload();
+
+  done();
+});
+
 // The watch task (to automatically rebuild when the source code changes)
 // Does only generate jsoneditor.js and jsoneditor.css, and copy the image
 // Does NOT minify the code and does NOT generate the minimalist version
-gulp.task('watch', ['bundle'], function () {
-  // TODO: don't minify when in watch mode
+gulp.task(WATCH, ['bundle'], function() {
+  browserSync.init({
+    open: 'local',
+    server: '.',
+    startPath: '/src/develop.html',
+    minify: false
+  })
 
-  gulp.watch(['src/**/*'], ['bundle'])
+  gulp.watch('src/**/*', ['bundle-and-reload'])
 })
 
 // The default task (called when you run `gulp`)
diff --git a/package.json b/package.json
index dd8a956..eb20cfc 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,7 @@
     "babel-loader": "6.2.5",
     "babel-preset-stage-2": "6.16.0",
     "babel-preset-stage-3": "6.16.0",
+    "browser-sync": "2.17.3",
     "css-loader": "0.25.0",
     "gulp": "3.9.1",
     "gulp-shell": "0.5.2",