diff --git a/CHANGELOG b/CHANGELOG
index 70a3e62..14e25ec 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 - Fix default Postgres port for non-packaged DBMS (Drew Blessing)
 - Add migration instructions coming from an existing GitLab installation (Goni Zahavy)
 - Add a gitlab.yml conversion support script
+- Correct default gravatar configuration (#112) (Julien Pivotto)
 
 6.8.1
 - Use gitlab-rails 6.8.1
diff --git a/files/gitlab-cookbooks/gitlab/definitions/template_symlink.rb b/files/gitlab-cookbooks/gitlab/definitions/template_symlink.rb
index 9b68bef..4da7290 100644
--- a/files/gitlab-cookbooks/gitlab/definitions/template_symlink.rb
+++ b/files/gitlab-cookbooks/gitlab/definitions/template_symlink.rb
@@ -15,13 +15,14 @@
 # limitations under the License.
 #
 
-define :template_symlink, :link_from => nil, :source => nil, :owner => nil, :group => nil, :mode => nil, :variables => nil, :notifies => nil, :restarts => [] do
+define :template_symlink, :link_from => nil, :source => nil, :owner => nil, :group => nil, :mode => nil, :variables => nil, :helpers => nil, :notifies => nil, :restarts => [] do
   template params[:name] do
     source params[:source]
     owner params[:owner]
     group params[:group]
     mode params[:mode]
     variables params[:variables]
+    helpers *params[:helpers] if params[:helpers]
     notifies *params[:notifies] if params[:notifies]
     params[:restarts].each do |resource|
       notifies :restart, resource
diff --git a/files/gitlab-cookbooks/gitlab/libraries/helper.rb b/files/gitlab-cookbooks/gitlab/libraries/helper.rb
index 93179a3..90a595c 100644
--- a/files/gitlab-cookbooks/gitlab/libraries/helper.rb
+++ b/files/gitlab-cookbooks/gitlab/libraries/helper.rb
@@ -83,3 +83,11 @@ class OmnibusHelper
   end
 
 end
+
+module SingleQuoteHelper
+
+  def single_quote(string)
+   "'#{string}'" if not string.nil?
+  end
+
+end
diff --git a/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb b/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
index ba41345..c9de0ef 100644
--- a/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
+++ b/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
@@ -77,6 +77,7 @@ end
 template_symlink File.join(gitlab_rails_etc_dir, "gitlab.yml") do
   link_from File.join(gitlab_rails_source_dir, "config/gitlab.yml")
   source "gitlab.yml.erb"
+  helpers SingleQuoteHelper
   owner "root"
   group "root"
   mode "0644"
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
index 645f39c..e5a32d1 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
@@ -107,8 +107,8 @@ production: &base
   ## Gravatar
   gravatar:
     enabled: <%= @gravatar_enabled %>            # Use user avatar image from Gravatar.com (default: true)
-    plain_url: "<%= @gravatar_plain_url %>"     # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm
-    ssl_url:   "<%= @gravatar_ssl_url %>"    # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm
+    plain_url: <%= single_quote(@gravatar_plain_url) %>     # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm
+    ssl_url:   <%= single_quote(@gravatar_ssl_url) %>    # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm
 
   #
   # 2. Auth settings
--
libgit2 0.21.2