diff --git a/CHANGELOG b/CHANGELOG
index 0902cbd..1bf2ce7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
 - Send application email via SMTP
 - Support changing the name of the "git" user / group (Michael Fenn)
 - Configure omniauth in gitlab.yml
+- Expose more fields under 'extra' in gitlab.yml
 
 6.9.0
 - Make SSH port in clone URLs configurable (Julien Pivotto)
diff --git a/files/gitlab-cookbooks/gitlab/attributes/default.rb b/files/gitlab-cookbooks/gitlab/attributes/default.rb
index e107ff8..22f1bdb 100644
--- a/files/gitlab-cookbooks/gitlab/attributes/default.rb
+++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb
@@ -106,6 +106,10 @@ default['gitlab']['gitlab-rails']['gitlab_shell_ssh_port'] = 22
 default['gitlab']['gitlab-rails']['git_bin_path'] = "/opt/gitlab/embedded/bin/git"
 default['gitlab']['gitlab-rails']['git_max_size'] = 5242880
 default['gitlab']['gitlab-rails']['git_timeout'] = 10
+default['gitlab']['gitlab-rails']['extra_google_analytics_id'] = nil
+default['gitlab']['gitlab-rails']['extra_piwik_url'] = nil
+default['gitlab']['gitlab-rails']['extra_piwik_site_id'] = nil
+default['gitlab']['gitlab-rails']['extra_sign_in_text'] = nil
 
 default['gitlab']['gitlab-rails']['aws_enable'] = false
 default['gitlab']['gitlab-rails']['aws_access_key_id'] = nil
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
index 3749374..cd05cf2 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
@@ -245,11 +245,11 @@ production: &base
 
   extra:
     ## Google analytics. Uncomment if you want it
-    # google_analytics_id: '_your_tracking_id'
+    google_analytics_id: <%= single_quote(@extra_google_analytics_id) %>
 
     ## Piwik analytics.
-    # piwik_url: '_your_piwik_url'
-    # piwik_site_id: '_your_piwik_site_id'
+    piwik_url: <%= single_quote(@extra_piwik_url) %>
+    piwik_site_id: <%= single_quote(@extra_piwik_site_id) %>
 
     <% if @extra_sign_in_text %>
     ## Text under sign-in page (Markdown enabled)
--
libgit2 0.21.2