diff --git a/runbot/res_config.py b/runbot/res_config.py
index 23c1d661..52703bf0 100644
--- a/runbot/res_config.py
+++ b/runbot/res_config.py
@@ -29,6 +29,7 @@ class runbot_config_settings(osv.osv_memory):
         'default_running_max': fields.integer('Maximum Number of Running Builds'),
         'default_timeout': fields.integer('Default Timeout (in seconds)'),
         'default_starting_port': fields.integer('Starting Port for Running Builds'),
+        'default_domain': fields.char('Runbot Domain'),
     }
 
     def get_default_parameters(self, cr, uid, fields, context=None):
@@ -37,11 +38,13 @@ class runbot_config_settings(osv.osv_memory):
         running_max = icp.get_param(cr, uid, 'runbot.running_max', default=75)
         timeout = icp.get_param(cr, uid, 'runbot.timeout', default=1800)
         starting_port = icp.get_param(cr, uid, 'runbot.starting_port', default=2000)
+        runbot_domain = icp.get_param(cr, uid, 'runbot.domain', default='runbot.odoo.com')
         return {
         	'default_workers': int(workers),
         	'default_running_max': int(running_max),
             'default_timeout': int(timeout),
             'default_starting_port': int(starting_port),
+            'default_domain': runbot_domain,
         }
 
     def set_default_parameters(self, cr, uid, ids, context=None):
@@ -51,6 +54,7 @@ class runbot_config_settings(osv.osv_memory):
         icp.set_param(cr, uid, 'runbot.running_max', config.default_running_max)
         icp.set_param(cr, uid, 'runbot.timeout', config.default_timeout)
         icp.set_param(cr, uid, 'runbot.starting_port', config.default_starting_port)
+        icp.set_param(cr, uid, 'runbot.domain', config.default_domain)
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/runbot/res_config_view.xml b/runbot/res_config_view.xml
index 8e23ccad..1f863499 100644
--- a/runbot/res_config_view.xml
+++ b/runbot/res_config_view.xml
@@ -32,6 +32,10 @@
                                 <field name="default_starting_port" class="oe_inline"/>
                                 <label for="default_starting_port"/>
                             </div>
+                            <div>
+                                <field name="default_domain" class="oe_inline"/>
+                                <label for="default_domain"/>
+                            </div>
                         </div>
                     </group>
                 </form>