diff --git a/CHANGELOG b/CHANGELOG
index 9f17573..717fc5e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,7 @@ omnibus-gitlab repository.
 - Log `rake db:migrate` output in /tmp
 - Support `issue_closing_pattern` via gitlab.rb (Michael Hill)
 - Use SIGHUP for zero-downtime NGINX configuration changes
+- Give NGINX its own working directory
 
 7.2.0
 - Pass environment variables to Unicorn and Sidekiq (Chris Portman)
diff --git a/files/gitlab-cookbooks/gitlab/recipes/nginx.rb b/files/gitlab-cookbooks/gitlab/recipes/nginx.rb
index 5e43a65..4fb1d97 100644
--- a/files/gitlab-cookbooks/gitlab/recipes/nginx.rb
+++ b/files/gitlab-cookbooks/gitlab/recipes/nginx.rb
@@ -18,11 +18,13 @@
 
 nginx_dir = node['gitlab']['nginx']['dir']
 nginx_etc_dir = File.join(nginx_dir, "etc")
+nginx_working_dir = File.join(nginx_dir, "working")
 nginx_log_dir = node['gitlab']['nginx']['log_directory']
 
 [
   nginx_dir,
   nginx_etc_dir,
+  nginx_working_dir,
   nginx_log_dir,
 ].each do |dir_name|
   directory dir_name do
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/sv-nginx-run.erb b/files/gitlab-cookbooks/gitlab/templates/default/sv-nginx-run.erb
index 0efbbc7..82b5dc1 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/sv-nginx-run.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/sv-nginx-run.erb
@@ -1,4 +1,5 @@
 #!/bin/sh
 exec 2>&1
 <%= render("mount_point_check.erb") %>
+cd <%= File.join(node['gitlab']['nginx']['dir'], "working") %>
 exec chpst -P /opt/gitlab/embedded/sbin/nginx -c <%= File.join(node['gitlab']['nginx']['dir'], "etc", "nginx.conf") %>
--
libgit2 0.21.2