diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb
index 987b95e89b9e6ead5657ccdddd07a96888d155a7..57e23cea00eb5776cfd4a4a616dd7b561953054a 100644
--- a/app/controllers/profiles_controller.rb
+++ b/app/controllers/profiles_controller.rb
@@ -85,7 +85,8 @@ class ProfilesController < Profiles::ApplicationController
       :twitter,
       :username,
       :website_url,
-      :organization
+      :organization,
+      :preferred_language
     )
   end
 end
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index c74b3249a13057c85d8977d5c64922a58493ca7f..dc71a04cbf048177dbc0e8cdcc5aed004bb8e113 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -72,6 +72,9 @@
         = f.label :public_email, class: "label-light"
         = f.select :public_email, options_for_select(@user.all_emails, selected: @user.public_email), { include_blank: 'Do not show on profile' }, class: "select2"
         %span.help-block This email will be displayed on your public profile.
+      .form-group
+        = f.label :preferred_language, class: "label-light"
+        = f.select :preferred_language, Gitlab::I18n::AVAILABLE_LANGUAGES, {}, class: "select2"
       .form-group
         = f.label :skype, class: "label-light"
         = f.text_field :skype, class: "form-control"
diff --git a/lib/gitlab/i18n.rb b/lib/gitlab/i18n.rb
new file mode 100644
index 0000000000000000000000000000000000000000..8c578aa0b4650631ed5e0b604a3ac68a8f6930c5
--- /dev/null
+++ b/lib/gitlab/i18n.rb
@@ -0,0 +1,9 @@
+module Gitlab
+  module I18n
+    AVAILABLE_LANGUAGES = [
+      [_('English'), 'en'],
+      [_('Spanish'), 'es'],
+      [_('Deutsch'), 'de']
+    ]
+  end
+end