diff --git a/.gitignore b/.gitignore
index 23cada00f04953dd1f52dad483f89ee8a0947a22..770e370a2331c328850dc8ee14dd1a29741a1e01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,7 @@
 /host
 /port
 /webpack_port
+/webpack_livereload
 /.ruby-version
 /.ruby-gemset
 /localhost.*
diff --git a/Makefile b/Makefile
index 1bef057a3f976376f0b01e3d6364d10fce83f3b3..05a3785cb5bde2d3d6b663e69eed311e55ba0edc 100644
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,8 @@ username = $(shell whoami)
 sshd_bin = $(shell which sshd)
 git_bin = $(shell which git)
 webpack_port = $(shell cat webpack_port 2>/dev/null || echo '3808')
+# We count any existance as true
+webpack_livereload = $(shell cat webpack_livereload 2>/dev/null || echo 'true')
 
 all: gitlab-setup gitlab-shell-setup gitlab-workhorse-setup support-setup gitaly-setup
 
@@ -146,6 +148,7 @@ Procfile:
 		-e "s|/usr/sbin/sshd|${sshd_bin}|"\
 		-e "s|postgres |${postgres_bin_dir}/postgres |"\
 		-e "s|DEV_SERVER_PORT=3808 |DEV_SERVER_PORT=${webpack_port} |"\
+		-e "s|DEV_SERVER_LIVERELOAD=true |DEV_SERVER_LIVERELOAD=${webpack_livereload} |"\
 		$@.example > $@
 	if [ -f .vagrant_enabled ]; then \
 		echo "0.0.0.0" > host; \
diff --git a/Procfile.example b/Procfile.example
index 5f909c3161520ade74fe9020fef964a1227c5aea..261874acf7c49cfd9b7df517a78a6f2bcd99dbb9 100644
--- a/Procfile.example
+++ b/Procfile.example
@@ -14,4 +14,4 @@ rails-background-jobs: exec /usr/bin/env SIDEKIQ_LOG_ARGUMENTS=1 RAILS_ENV=devel
 #sshd: exec /usr/sbin/sshd -e -D -f /home/git/openssh/sshd_config
 #nginx: exec nginx -p /home/git/nginx -c conf/nginx.conf
 #gitaly: exec /usr/bin/env GITALY_SOCKET_PATH=/home/git/gitaly.socket GITALY_PROMETHEUS_LISTEN_ADDR=:9101 gitaly/bin/gitaly
-webpack: exec /usr/bin/env NODE_ENV=development DEV_SERVER_PORT=3808 support/exec-cd gitlab npm run dev-server
+webpack: exec /usr/bin/env NODE_ENV=development DEV_SERVER_PORT=3808 DEV_SERVER_LIVERELOAD=true support/exec-cd gitlab npm run dev-server