diff --git a/app/Library/Assets.php b/app/Library/Assets.php
index 5c3c1404..70340dda 100644
--- a/app/Library/Assets.php
+++ b/app/Library/Assets.php
@@ -33,14 +33,14 @@ class Assets
 
         foreach ($scripts as $filename) {
             if (Config::get('app.debug') && $filename !== 'templates.js') {
-                $scriptTags .= "<script src='http://localhost:61999/build/scripts/{$filename}'></script>";
+                $scriptTags .= "<script src='" . env('APP_URL') . ":61999/build/scripts/{$filename}'></script>";
             } else {
                 $scriptTags .= "<script src='/build/scripts/{$filename}?" . filemtime(public_path("build/scripts/{$filename}")) . "'></script>";
             }
         }
 
         if (Config::get('app.debug')) {
-            $scriptTags .= '<script src="http://localhost:61999/webpack-dev-server.js"></script>';
+            $scriptTags .= '<script src="' . env('APP_URL') . ':61999/webpack-dev-server.js"></script>';
         }
 
         return $scriptTags;
diff --git a/gulpfile.js b/gulpfile.js
index 021c3417..48d3f434 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -69,12 +69,12 @@ gulp.task("webpack-dev-server", function () {
 
     new WebpackDevServer(compiler, {
         // server and middleware options, currently blank
-    }).listen(61999, "localhost", function (err) {
+    }).listen(webpackDevConfig.devPort, webpackDevConfig.devHost, function (err) {
         if (err)
             throw new gutil.PluginError("webpack-dev-server", err);
 
         // Server listening
-        gutil.log("[webpack-dev-server]", "http://localhost:61999/webpack-dev-server/index.html");
+        gutil.log("[webpack-dev-server]", webpackDevConfig.devUrl + "/webpack-dev-server/index.html");
     });
 });
 
diff --git a/webpack.dev.config.js b/webpack.dev.config.js
index 54a6a69c..8cde089c 100644
--- a/webpack.dev.config.js
+++ b/webpack.dev.config.js
@@ -6,7 +6,12 @@ var webpackBaseConfig = require('./webpack.base.config.js');
 var config = _.clone(webpackBaseConfig);
 
 config.devtool = 'eval-source-map';
-config.output.publicPath = 'http://localhost:61999/build/';
+
+config.devHost = 'localhost';
+config.devPort = '6199';
+config.devUrl  = 'http://' + config.devHost + ':' + (config.devPort == '80' ? '' : config.devPort);
+
+config.output.publicPath = config.devUrl + '/build/';
 
 
 module.exports = config;