diff --git a/build.js b/build.js
index 550e70e..374f241 100644
--- a/build.js
+++ b/build.js
@@ -2,12 +2,12 @@
 var exec = require('child_process').exec;
 
 var executable = (!process.argv[3].indexOf('server')) ? 'webpack-dev-server' : 'webpack';
-var cmdLine = './node_modules/.bin/' + executable;
+var cmdLine = '"./node_modules/.bin/' + executable + '"';
 var environ = (!process.argv[2].indexOf('development')) ? 'development' : 'production';
 var command;
 
 if (process.platform === 'win32') {
-  cmdLine = 'set NODE_ENV=' + environ + '&& ' + cmdLine;
+  cmdLine = 'set NODE_ENV=' + environ + ' && ' + cmdLine;
 } else {
   cmdLine = 'NODE_ENV=' + environ + ' ' + cmdLine;
 }