diff --git a/CHANGELOG b/CHANGELOG
index 640b2bc..06c8270 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 7.0.0
 - Specify numeric user / group identifiers
 - Support AWS S3 attachment storage
+- Support changing the name of the "git" user / group (Michael Fenn)
 
 6.9.0
 - Make SSH port in clone URLs configurable (Julien Pivotto)
diff --git a/README.md b/README.md
index ff67424..cc9ebf7 100644
--- a/README.md
+++ b/README.md
@@ -171,6 +171,21 @@ git_data_dir "/mnt/nas/git-data"
 
 Run `sudo gitlab-ctl reconfigure` for the change to take effect.
 
+### Changing the name of the Git user / group
+
+By default, omnibus-gitlab uses the user name `git` for Git gitlab-shell login,
+ownership of the Git data itself, and SSH URL generation on the web interface.
+Similarly, `git` group is used for group ownership of the Git data.  You can
+change the user and group by adding the following lines to
+`/etc/gitlab/gitlab.rb`.
+
+```ruby
+user['username'] = "gitlab"
+user['group'] = "gitlab"
+```
+
+Run `sudo gitlab-ctl reconfigure` for the change to take effect.
+
 ### Setting up LDAP sign-in
 
 If you have an LDAP directory service such as Active Directory, you can configure
--
libgit2 0.21.2