diff --git a/debian/gitlab.links b/debian/gitlab.links
index 62afc061de..da62ed6fef 100644
--- a/debian/gitlab.links
+++ b/debian/gitlab.links
@@ -1,4 +1,4 @@
-var/lib/gitlab/uploads usr/share/gitlab/public/uploads
+var/lib/gitlab/public usr/share/gitlab/public
 var/log/gitlab usr/share/gitlab/log
 run/gitlab usr/share/gitlab/tmp
 etc/gitlab usr/share/gitlab/config
diff --git a/debian/install b/debian/install
index b25aa76d2d..f9a0cf208c 100644
--- a/debian/install
+++ b/debian/install
@@ -30,7 +30,6 @@ lib usr/share/gitlab
 MAINTENANCE.md usr/share/gitlab
 PROCESS.md usr/share/gitlab
 Procfile usr/share/gitlab
-public usr/share/gitlab
 Rakefile usr/share/gitlab
 README.md usr/share/gitlab
 scripts usr/share/gitlab
diff --git a/debian/postinst b/debian/postinst
index 94d9ab83d4..b5275ec2c3 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -40,7 +40,7 @@ case "$1" in
     . /usr/lib/gitlab/scripts/adduser.sh
 
     gitlab_repo_path=${gitlab_data_dir}/repositories
-    gitlab_uploads_path=${gitlab_data_dir}/uploads
+    gitlab_uploads_path=${gitlab_data_dir}/public/uploads
 
     # Create directories and change ownership
     for i in ${gitlab_repo_path} ${gitlab_uploads_path} ${gitlab_pid_path}\
@@ -48,6 +48,9 @@ case "$1" in
       mkdir -p $i
       chown -R ${gitlab_user}: $i
     done
+
+    # nginx should be able to connect to gitlab-workhorse.socket and serve public
+    chown ${gitlab_user}:${nginx_user} -R ${gitlab_uploads_path}/.. ${gitlab_pid_path}
     
     # Customize permissions
     chmod -R ug+rwX,o-rwx ${gitlab_repo_path}/
diff --git a/debian/upstream-file-count-check.sh b/debian/upstream-file-count-check.sh
index db2fad98f2..81ea32b198 100644
--- a/debian/upstream-file-count-check.sh
+++ b/debian/upstream-file-count-check.sh
@@ -1,6 +1,6 @@
 ucount=$(ls -1 | wc -l)
 dcount=$(cat debian/install |cut -d' ' -f1|grep -v debian |wc -l)
-ignored=7
+ignored=8
 if ! [ $(echo "$ucount" - "$dcount"|bc) -eq $ignored ]; then
   echo "Found new files added by upstream and not added to debian/install"
   echo "Add them to debian/install or adjust 'ignored=${ignored}'"