diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 2f49071adf6..2310a4ab6da 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -271,10 +271,21 @@ class Website(openerp.addons.web.controllers.main.Home):
     def robots(self):
         return request.website.render('website.robots', {'url_root': request.httprequest.url_root})
 
-    @website.route(['/sitemap.xml'], type='http', auth="public")
+    @website.route('/sitemap', type='http', auth='public')
     def sitemap(self):
         return request.website.render('website.sitemap', {'pages': request.website.list_pages()})
 
+    @website.route('/sitemap.xml', type='http', auth="public")
+    def sitemap_xml(self):
+        body = request.website.render('website.sitemap_xml', {
+            'pages': request.website.list_pages()
+        })
+
+        return request.make_response(body, [
+            ('Content-Type', 'application/xml;charset=utf-8')
+        ])
+
+
 class Images(http.Controller):
     def placeholder(self, response):
         # file_open may return a StringIO. StringIO can be closed but are
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 962cc32fbf5..43b85ee8b61 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -401,10 +401,22 @@ User-agent: *
 Sitemap: <t t-esc="url_root"/>sitemap.xml
         </template>
 
-        <template id="sitemap">
+        <template id="sitemap" name="Site Map" page="True">
+            <t t-call="website.layout">
+                <ul>
+                    <li t-foreach="pages" t-as="page">
+                        <a t-att-href="page['url']"><t t-esc="page['name']"/></a>
+                    </li>
+                </ul>
+            </t>
+        </template>
+
+        <template id="sitemap_xml">
             <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
                 <t t-foreach="pages" t-as="page">
-                    <url t-esc="page['url']"/>
+                    <url>
+                        <loc><t t-esc="page['url']"/></loc>
+                    </url>
                 </t>
             </urlset>
         </template>