diff --git a/app/models/project.rb b/app/models/project.rb
index aa16b055e81b53506f554f064a1eb4958f49dcff..a1888c089ce33bbb92cdfca0a62461dfda45b581 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1164,7 +1164,7 @@ class Project < ActiveRecord::Base
 
   def pages_url
     if Dir.exist?(public_pages_path)
-      host = "#{namespace.path}.#{Settings.pages.domain}"
+      host = "#{namespace.path}.#{Settings.pages.host}"
       url = Gitlab.config.pages.url.sub(/^https?:\/\//) do |prefix|
         "#{prefix}#{namespace.path}."
       end
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index fa764844cb9c78bb724adb718c484677e371f819..c6f06d43d07cc3bc391ec4b48e621764e797696d 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -162,7 +162,7 @@ production: &base
     # The domain under which the pages are served:
     # http://group.example.com/project
     # or project path can be a group page: group.example.com
-    domain: example.com
+    host: example.com
     port: 80 # Set to 443 if you serve the pages with HTTPS
     https: false # Set to true if you serve the pages with HTTPS
 
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 3932745e20c5e17c38ac5f5afd1877c91f01dd65..b938a9cdb2a1aeae0e172d73ba233ace201c843b 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -264,7 +264,7 @@ Settings.registry['path']            = File.expand_path(Settings.registry['path'
 Settings['pages'] ||= Settingslogic.new({})
 Settings.pages['enabled']         = false if Settings.pages['enabled'].nil?
 Settings.pages['path']            = File.expand_path('shared/pages/', Rails.root)
-Settings.pages['domain']          ||= "example.com"
+Settings.pages['host']            ||= "example.com"
 Settings.pages['https']           = false if Settings.pages['https'].nil?
 Settings.pages['port']            ||= Settings.pages.https ? 443 : 80
 Settings.pages['protocol']        ||= Settings.pages.https ? "https" : "http"