diff --git a/CHANGELOG b/CHANGELOG
index a89103d..9327fb6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,7 @@ omnibus-gitlab repository.
 - Built-in UDP log shipping (Enterprise Edition only)
 - Trigger Unicorn/Sidekiq restart during version change
 - Recursively set the SELinux type of ~git/.ssh
+- Add support for the LDAP admin_group attribute (GitLab EE)
 
 7.0.0-ee.omnibus.1
 - Fix MySQL build for Ubuntu 14.04
diff --git a/files/gitlab-cookbooks/gitlab/attributes/default.rb b/files/gitlab-cookbooks/gitlab/attributes/default.rb
index 826b250..8618306 100644
--- a/files/gitlab-cookbooks/gitlab/attributes/default.rb
+++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb
@@ -90,6 +90,7 @@ default['gitlab']['gitlab-rails']['ldap_password'] = nil
 default['gitlab']['gitlab-rails']['ldap_allow_username_or_email_login'] = nil
 default['gitlab']['gitlab-rails']['ldap_user_filter'] = nil
 default['gitlab']['gitlab-rails']['ldap_group_base'] = nil
+default['gitlab']['gitlab-rails']['ldap_admin_group'] = nil
 default['gitlab']['gitlab-rails']['omniauth_enabled'] = false
 default['gitlab']['gitlab-rails']['omniauth_allow_single_sign_on'] = nil
 default['gitlab']['gitlab-rails']['omniauth_block_auto_created_users'] = nil
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
index ca2f2f5..89a5d57 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
@@ -161,6 +161,8 @@ production: &base
     #
     group_base: <%= single_quote(@ldap_group_base) %>
 
+    admin_group: <%= single_quote(@ldap_admin_group) %>
+
 
   ## OmniAuth settings
   omniauth:
--
libgit2 0.21.2