diff --git a/addons/website/data/data.xml b/addons/website/data/data.xml
index f7d29ac4046..84c7e5877f3 100644
--- a/addons/website/data/data.xml
+++ b/addons/website/data/data.xml
@@ -6,6 +6,7 @@
             <field name="domain">localhost</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="user_id" ref="base.public_user"/>
+            <field name="favicon" type="base64" file="web/static/src/img/favicon.ico"/>
         </record>
 
         <record id="main_menu" model="website.menu">
diff --git a/addons/website/models/res_config.py b/addons/website/models/res_config.py
index ab90cb3615a..acd63957141 100644
--- a/addons/website/models/res_config.py
+++ b/addons/website/models/res_config.py
@@ -26,6 +26,7 @@ class website_config_settings(osv.osv_memory):
         'cdn_filters': fields.related('website_id', 'cdn_filters', type="text", string='CDN Filters'),
         'module_website_form_editor': fields.boolean("Form builder: create and customize forms"),
         'module_website_version': fields.boolean("A/B testing and versioning"),
+        'favicon': fields.related('website_id', 'favicon', type="binary", string="Favicon", help="This field holds the image used to display a favicon on the website."),
     }
 
     def on_change_website_id(self, cr, uid, ids, website_id, context=None):
diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 22d2f2f24fe..4d54f7bacd5 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -180,7 +180,8 @@ class website(osv.osv):
         'cdn_url': fields.char('CDN Base URL'),
         'cdn_filters': fields.text('CDN Filters', help="URL matching those filters will be rewritten using the CDN Base URL"),
         'partner_id': fields.related('user_id','partner_id', type='many2one', relation='res.partner', string='Public Partner'),
-        'menu_id': fields.function(_get_menu, relation='website.menu', type='many2one', string='Main Menu')
+        'menu_id': fields.function(_get_menu, relation='website.menu', type='many2one', string='Main Menu'),
+        'favicon': fields.binary(string="Website Favicon", help="This field holds the image used to display a favicon on the website."),
     }
     _defaults = {
         'user_id': lambda self,cr,uid,c: self.pool['ir.model.data'].xmlid_to_res_id(cr, openerp.SUPERUSER_ID, 'base.public_user'),
diff --git a/addons/website/views/res_config.xml b/addons/website/views/res_config.xml
index 0bc1e53cc8c..cf9ddf473a8 100644
--- a/addons/website/views/res_config.xml
+++ b/addons/website/views/res_config.xml
@@ -93,6 +93,10 @@
                                 string="Configure website menus" class="oe_link"/>
                         </group>
                         <group string="Advanced" name="advanced">
+                            <label for="favicon"/>
+                            <div>
+                                <field name="favicon" widget="image" class="oe_avatar oe_left"/>
+                            </div>
                             <label for="id" string="Extra Features"/>
                             <div>
                                 <div>
@@ -154,7 +158,7 @@
         <menuitem id="menu_website_view" name="View Website" action="website.action_website" parent="website.menu_website"/>
 
         <menuitem id="menu_website_global_configuration" parent="menu_website_configuration"
-            sequence="100" name="Configuration" groups="base.group_no_one"/>
+            sequence="100" name="Configuration" groups="base.group_system"/>
         <menuitem id="menu_website_website_settings" parent="menu_website_global_configuration" name="Settings" action="action_website_configuration"/>
 
     </data>
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index c8d2aa758a1..9faa0c67853 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -144,6 +144,7 @@
             </script>
 
             <t t-raw="head or ''" name='layout_head'/>
+            <link rel="shortcut icon" type="image/x-icon" t-attf-href="/web/image/website/#{website.id}/favicon/16x16"/>
         </head>
         <body>
             <div id="wrapwrap">