diff --git a/doc/settings/configuration.md b/doc/settings/configuration.md
index e15714ed7b976c0fc3a22bc1bd417fd203a1d9a2_ZG9jL3NldHRpbmdzL2NvbmZpZ3VyYXRpb24ubWQ=..86d89cd8a8b675d9c8dba989b058a55864848981_ZG9jL3NldHRpbmdzL2NvbmZpZ3VyYXRpb24ubWQ= 100644
--- a/doc/settings/configuration.md
+++ b/doc/settings/configuration.md
@@ -307,8 +307,19 @@
 Some types of mounts won't allow automatic creation of directories by root user
  (default user for initial setup), eg. NFS with `root_squash` enabled on the
 share. To work around this the omnibus-gitlab package will attempt to create
-these directories using the directory's owner user, but if you are mounting these
-directories individually, you should disable the management of storage directories.
+these directories using the directory's owner user.
+
+If you have the `/etc/gitlab` directory mounted, you can turn off management of
+that directory.
+
+In `/etc/gitlab/gitlab.rb` set:
+
+```ruby
+manage_storage_directories['manage_etc'] = false
+```
+
+If you are mounting all GitLab's storage directories, each on a seperate mount,
+you should completely disable the management of storage directories.
 
 In order to disable management of these directories,
 in `/etc/gitlab/gitlab.rb` set:
diff --git a/files/gitlab-config-template/gitlab.rb.template b/files/gitlab-config-template/gitlab.rb.template
index e15714ed7b976c0fc3a22bc1bd417fd203a1d9a2_ZmlsZXMvZ2l0bGFiLWNvbmZpZy10ZW1wbGF0ZS9naXRsYWIucmIudGVtcGxhdGU=..86d89cd8a8b675d9c8dba989b058a55864848981_ZmlsZXMvZ2l0bGFiLWNvbmZpZy10ZW1wbGF0ZS9naXRsYWIucmIudGVtcGxhdGU= 100644
--- a/files/gitlab-config-template/gitlab.rb.template
+++ b/files/gitlab-config-template/gitlab.rb.template
@@ -667,6 +667,7 @@
 ## Set only if the select directories are created manually
 ## See: http://doc.gitlab.com/omnibus/settings/configuration.html#disable-storage-directories-management
 # manage_storage_directories['enable'] = false
+# manage_storage_directories['manage_etc'] = false
 
 #######
 # Git #