diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 26bd0696946..b2dccbe3d4c 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -29,6 +29,9 @@ gitlab:
   # Email address used in the "From" field in mails sent by GitLab
   email_from: gitlab@localhost
 
+  # Email address of your support contanct (default: same as email_from)
+  support_email: support@localhost
+
   ## Project settings
   default_projects_limit: 10
   # signup_enabled: true          # default: false - Account passwords are not sent via the email if signup is enabled.
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 4e31b65fab0..a1afa5b22c4 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -49,6 +49,7 @@ Settings.gitlab['port']       ||= Settings.gitlab.https ? 443 : 80
 Settings.gitlab['relative_url_root'] ||= ''
 Settings.gitlab['protocol']   ||= Settings.gitlab.https ? "https" : "http"
 Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}"
+Settings.gitlab['support_email']  ||= Settings.gitlab.email_from
 Settings.gitlab['url']        ||= Settings.send(:build_gitlab_url)
 Settings.gitlab['user']       ||= 'gitlab'
 Settings.gitlab['signup_enabled'] ||= false