diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 5b0a99d4093..f0b90b82440 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -17,9 +17,7 @@ class Website(openerp.addons.web.controllers.main.Home):
     @http.route('/page/<path:path>', type='http', auth="db")
     def page(self, path):
         #def get_html_head():
-        #    head = ['<script type="text/javascript" src="%s"></script>' % i for i in manifest_list('js', db=request.db)]
         #    head += ['<link rel="stylesheet" href="%s">' % i for i in manifest_list('css', db=request.db)]
-        #    head += ['<script type="text/javascript" src="/website/static/src/js/website_bootstrap.js"></script>']
         #modules = request.registry.get("ir.module.module").search_read(request.cr, openerp.SUPERUSER_ID, fields=['id', 'shortdesc', 'summary', 'icon_image'], limit=50)
         try:
             request.session.check_security()
@@ -31,7 +29,9 @@ class Website(openerp.addons.web.controllers.main.Home):
         context = {
             'inherit_branding': editable
         }
+        script = "\n".join(['<script type="text/javascript" src="%s"></script>' % i for i in manifest_list('js', db=request.db)])
         values = {
+            'script' : script,
             'editable': editable,
             'request': request,
             'registry': request.registry,
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index 166b2bf1043..b7b0d75b661 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -12,7 +12,7 @@
                         <link rel="stylesheet" href="/web/webclient/css"/>
                         <link rel='stylesheet' href='https://www.openerp.com/saas_master/static/site_new/fonts/lato/stylesheet.css'/>
                         <link rel='stylesheet' href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,300,600,700'/>
-                        <script type="text/javascript" src="/web/webclient/js"></script>
+                        <t t-raw="script"/>
                         <t t-if="editable">
                             <script type="text/javascript" src="/website/static/src/js/website_bootstrap.js"></script>
                             <script type="text/javascript" src="http://cdn.aloha-editor.org/latest/lib/require.js"></script>