diff --git a/addons/portal/__init__.py b/addons/portal/__init__.py
new file mode 100644
index 00000000000..dd15b5c32e5
--- /dev/null
+++ b/addons/portal/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import controllers
diff --git a/addons/portal/__manifest__.py b/addons/portal/__manifest__.py
new file mode 100644
index 00000000000..61e0818a929
--- /dev/null
+++ b/addons/portal/__manifest__.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+{
+    'name': 'Customer Portal',
+    'summary': 'Customer Portal',
+    'sequence': '9000',
+    'category': 'Hidden',
+    'description': """
+This module adds required base code for a fully integrated customer portal.
+It contains the base controller class and base templates. Business addons
+will add their specific templates and controllers to extend the customer
+portal.
+
+This module contains most code coming from odoo v10 website_portal. Purpose
+of this module is to allow the display of a customer portal without having
+a dependency towards website edition and customization capabilities.""",
+    'data': [
+        'views/assets.xml',
+        'views/portal_templates.xml',
+    ],
+    'depends': ['http_routing', 'mail'],
+}
diff --git a/addons/portal/controllers/__init__.py b/addons/portal/controllers/__init__.py
new file mode 100644
index 00000000000..903b755e71e
--- /dev/null
+++ b/addons/portal/controllers/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import portal
diff --git a/addons/portal/controllers/portal.py b/addons/portal/controllers/portal.py
new file mode 100644
index 00000000000..1e7d97f7eb8
--- /dev/null
+++ b/addons/portal/controllers/portal.py
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo.http import Controller, request, route
+
+
+class CustomerPortal(Controller):
+
+    def _prepare_portal_layout_values(self):
+        return {
+            'page_name': 'home',
+        }
+
+    @route(['/my', '/my/home'], type='http', auth="user", website=True)
+    def home(self, **kw):
+        values = self._prepare_portal_layout_values()
+        return request.render("portal.portal_layout", values)
diff --git a/addons/website/static/src/less/bootstrap.extend.less b/addons/portal/static/src/less/bootstrap.extend.less
similarity index 100%
rename from addons/website/static/src/less/bootstrap.extend.less
rename to addons/portal/static/src/less/bootstrap.extend.less
diff --git a/addons/website/static/src/less/website.ui.less b/addons/portal/static/src/less/website.ui.less
similarity index 100%
rename from addons/website/static/src/less/website.ui.less
rename to addons/portal/static/src/less/website.ui.less
diff --git a/addons/website/static/src/less/website.wrapwrap.less b/addons/portal/static/src/less/website.wrapwrap.less
similarity index 100%
rename from addons/website/static/src/less/website.wrapwrap.less
rename to addons/portal/static/src/less/website.wrapwrap.less
diff --git a/addons/portal/views/assets.xml b/addons/portal/views/assets.xml
new file mode 100644
index 00000000000..c90c7f3aacc
--- /dev/null
+++ b/addons/portal/views/assets.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <template id="assets_frontend" inherit_id="web.assets_frontend" name="Portal Assets">
+    	<xpath expr="//script[last()]" position="after">
+	        <link rel="stylesheet" type="text/less" href="/portal/static/src/less/website.ui.less"/>
+	        <link rel="stylesheet" type="text/less" href="/portal/static/src/less/website.wrapwrap.less"/>
+	        <link rel="stylesheet" type="text/less" href="/portal/static/src/less/bootstrap.extend.less"/>
+	    </xpath>
+    </template>
+</odoo>
\ No newline at end of file
diff --git a/addons/portal/views/portal_templates.xml b/addons/portal/views/portal_templates.xml
new file mode 100644
index 00000000000..715cb3edc57
--- /dev/null
+++ b/addons/portal/views/portal_templates.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <template id="frontend_layout" name="Main Frontend Layout">
+        <t t-call="web.layout">
+            <t t-set="head_website">
+                <script type="text/javascript">
+                    odoo.session_info = {
+                        is_superuser: <t t-esc="json.dumps(request.env.user._is_superuser())"/>,
+                        is_system: <t t-esc="json.dumps(request.env.user._is_system())"/>,
+                        is_website_user: <t t-esc="json.dumps(request.env.user._is_public())"/>,
+                        user_id: <t t-esc="json.dumps(request.env.user.id)" />,
+                        is_frontend: true,
+                    };
+                </script>
+
+                <t t-call-assets="web.assets_common" t-js="false"/>
+                <t t-call-assets="web.assets_frontend" t-js="false"/>
+
+                <t t-call-assets="web.assets_common" t-css="false"/>
+                <t t-call-assets="web.assets_frontend" t-css="false"/>
+            </t>
+            <t t-set="head" t-value="head_website + (head or '')"/>
+
+            <div id="wrapwrap" t-att-class="pageName or ''">
+                <header>
+                    <div class="navbar navbar-default navbar-static-top">
+                        <div class="container">
+                            <div class="navbar-header">
+                                <a href="/" class="navbar-brand logo">
+                                    <span t-field="res_company.logo" t-options="{'widget': 'image'}" t-att-alt="'Logo of %s' % res_company.name" t-att-title="res_company.name"/>
+                                </a>
+                            </div>
+                            <div class="collapse navbar-collapse navbar-top-collapse">
+                                <ul class="nav navbar-nav navbar-right" id="top_menu">
+                                    <li class="divider" t-ignore="true" t-if="not user_id._is_public()"/>
+                                    <li class="dropdown" t-ignore="true" t-if="not user_id._is_public()">
+                                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                                            <b>
+                                                <span t-esc="(len(user_id.name)&gt;25) and (user_id.name[:23]+'...') or user_id.name"/>
+                                                <span class="caret"></span>
+                                            </b>
+                                        </a>
+                                        <ul class="dropdown-menu js_usermenu" role="menu">
+                                            <li id="o_logout"><a t-attf-href="/web/session/logout?redirect=/" role="menuitem">Logout</a></li>
+                                        </ul>
+                                    </li>
+                                </ul>
+                            </div>
+                        </div>
+                    </div>
+                </header>
+                <main>
+                    <t t-raw="0"/>
+                </main>
+                <footer >
+                    <div id="footer">
+                    </div>
+                </footer>
+            </div>
+        </t>
+    </template>
+
+    <template id="portal_layout" name="Portal Layout">
+        <t t-call="portal.frontend_layout">
+        </t>
+    </template>
+
+    <template id="portal_my_home" name="My Portal">
+        <t t-call="portal.portal_layout">
+        </t>
+    </template>
+</odoo>
diff --git a/addons/web/views/report_templates.xml b/addons/web/views/report_templates.xml
index 6f723ca4750..bb5a11bc684 100644
--- a/addons/web/views/report_templates.xml
+++ b/addons/web/views/report_templates.xml
@@ -10,8 +10,8 @@
 
         <link rel="stylesheet" type="text/less" href="/web_editor/static/src/less/web_editor.common.less"/>
 
-        <!-- FIXME remove website dependency ..? -->
-        <link href="/website/static/src/less/website.wrapwrap.less" rel="stylesheet" type="text/less"/>
+        <!-- FIXME remove website / portal dependency ..? -->
+        <link href="/portal/static/src/less/website.wrapwrap.less" rel="stylesheet" type="text/less"/>
         <link href="/website/static/src/less/website.snippets.less" rel="stylesheet" type="text/less"/>
 
         <!-- TODO: Put in the right report ..? -->
diff --git a/addons/website/__manifest__.py b/addons/website/__manifest__.py
index eca433417d6..8ab5925f81e 100644
--- a/addons/website/__manifest__.py
+++ b/addons/website/__manifest__.py
@@ -9,7 +9,7 @@
     'website': 'https://www.odoo.com/page/website-builder',
     'version': '1.0',
     'description': "",
-    'depends': ['web', 'web_editor', 'web_planner'],
+    'depends': ['web', 'web_editor', 'web_planner', 'http_routing', 'portal'],
     'installable': True,
     'data': [
         'data/website_data.xml',
diff --git a/addons/website/models/__init__.py b/addons/website/models/__init__.py
index aa289415d5d..99fd60cddd5 100644
--- a/addons/website/models/__init__.py
+++ b/addons/website/models/__init__.py
@@ -5,9 +5,9 @@ from . import ir_actions
 from . import ir_attachment
 from . import ir_http
 from . import ir_qweb
+from . import website
 from . import ir_ui_view
 from . import res_company
 from . import res_partner
 from . import web_planner
-from . import website
 from . import website_config_settings
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 4bf165d3abe..83c5932d928 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -18,12 +18,9 @@
 
 <template id="assets_frontend" inherit_id="web.assets_frontend" name="Website Assets">
     <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/less" href="/website/static/src/less/website.ui.less"/>
         <link rel="stylesheet" type="text/less" href="/website/static/src/less/website.ui.components.less"/>
-        <link rel="stylesheet" type="text/less" href="/website/static/src/less/website.wrapwrap.less"/>
         <link rel="stylesheet" type="text/less" href="/website/static/src/less/website.snippets.less"/>
         <link rel="stylesheet" type="text/less" href="/website/static/src/less/website.zoomodoo.less"/>
-        <link rel="stylesheet" type="text/less" href="/website/static/src/less/bootstrap.extend.less"/>
     </xpath>
     <xpath expr="//script[last()]" position="after">
         <script type="text/javascript" src="/website/static/src/js/website.js"></script>
diff --git a/odoo/addons/base/res/res_users.py b/odoo/addons/base/res/res_users.py
index 2a66c05a4aa..1cc720b3696 100644
--- a/odoo/addons/base/res/res_users.py
+++ b/odoo/addons/base/res/res_users.py
@@ -561,6 +561,11 @@ class Users(models.Model):
     # for a few places explicitly clearing the has_group cache
     has_group.clear_cache = _has_group.clear_cache
 
+    @api.multi
+    def _is_public(self):
+        self.ensure_one()
+        return self.has_group('base.group_public')
+
     @api.multi
     def _is_system(self):
         self.ensure_one()