diff --git a/xdoc/src/plugin-resources/navigation.jelly b/xdoc/src/plugin-resources/navigation.jelly
index e47b1bb4..58c6fc49 100644
--- a/xdoc/src/plugin-resources/navigation.jelly
+++ b/xdoc/src/plugin-resources/navigation.jelly
@@ -27,37 +27,38 @@
         <body>
             <j:if test="${includeProjectDocumentation.equals('yes')}">
                 <menu key="navigation.menu.project_documentation"
-                    bundle="plugin-resources.templates.templates">
+                    bundle="plugin-resources.templates.templates"
+                    name="Project Documentation">
                     <item key="navigation.menu.item.about"
                         bundle="plugin-resources.templates.templates"
-                        href="/index.html" />
+                        name="About ${pom.name}" href="/index.html" />
 
                     <!-- Only display a "Downloads" menu link if the 
                         maven.xdoc.distributionUrl has been defined -->
                     <j:if test="${context.getVariable('maven.xdoc.distributionUrl') != null}">
                         <item key="navigation.menu.item.downloads"
                             bundle="plugin-resources.templates.templates"
-                            href="/downloads.html" />
+                            name="Downloads" href="/downloads.html" />
                     </j:if>
 
                     <item key="navigation.menu.item.project_info"
                         bundle="plugin-resources.templates.templates"
-                        href="/project-info.html" collapse="true">
+                        name="Project Info" href="/project-info.html" collapse="true">
                         <item key="navigation.menu.item.mailing_lists"
                             bundle="plugin-resources.templates.templates"
-                            href="/mail-lists.html" />
+                            name="Mailing Lists" href="/mail-lists.html" />
                         <item key="navigation.menu.item.project_team"
                             bundle="plugin-resources.templates.templates"
-                            href="/team-list.html" />
+                            name="Project Team" href="/team-list.html" />
                         <item key="navigation.menu.item.dependencies"
                             bundle="plugin-resources.templates.templates"
-                            href="/dependencies.html" />
+                            name="Dependencies" href="/dependencies.html" />
 
                         <j:set var="repository" value="${pom.repository}" />
                         <j:if test="${!empty(repository)}">
                             <item key="navigation.menu.item.source_repository"
                                 bundle="plugin-resources.templates.templates"
-                                href="/cvs-usage.html" />
+                                name="Source Repository" href="/cvs-usage.html" />
                         </j:if>
 
                         <j:set var="url"
@@ -65,12 +66,12 @@
                         <j:if test="${!empty(url)}">
                             <item key="navigation.menu.item.issue_tracking"
                                 bundle="plugin-resources.templates.templates"
-                                href="/issue-tracking.html" />
+                                name="Issue Tracking" href="/issue-tracking.html" />
                         </j:if>
                     </item>
                     <item key="navigation.menu.item.project_reports"
                         bundle="plugin-resources.templates.templates"
-                        href="/maven-reports.html" collapse="true">
+                        name="Project Reports" href="/maven-reports.html" collapse="true">
                         <j:forEach var="report" items="${reports}">
                             <j:set var="link" value="${report.link}" />
                             <j:set var="externalLink" value="${report.externalLink}" />
@@ -93,7 +94,7 @@
                     <j:if test="${devProcess}">
                         <item key="navigation.menu.item.development_process"
                             bundle="plugin-resources.templates.templates"
-                            href="/development-process.html" />
+                            name="Development Process" href="/development-process.html" />
                     </j:if>
                     <j:if test="${!devProcess}">
                         <j:set var="devProcessUrl"
@@ -101,7 +102,7 @@
                         <j:if test="${!empty(devProcessUrl)}">
                             <item key="navigation.menu.item.development_process"
                                 bundle="plugin-resources.templates.templates"
-                                href="${devProcessUrl}" />
+                                name="Development Process" href="${devProcessUrl}" />
                         </j:if>
                     </j:if>
                 </menu>
diff --git a/xdoc/src/plugin-resources/templates/cvs-usage.xml b/xdoc/src/plugin-resources/templates/cvs-usage.xml
index d7000ecb..55dcf41d 100644
--- a/xdoc/src/plugin-resources/templates/cvs-usage.xml
+++ b/xdoc/src/plugin-resources/templates/cvs-usage.xml
@@ -21,7 +21,10 @@
 <document>
     <properties>
         <title key="template.cvs_usage.title"
-            bundle="plugin-resources.templates.templates" />
+            bundle="plugin-resources.templates.templates" >
+            <message key="template.cvs_usage.title"
+                bundle="plugin-resources.templates.templates" />
+        </title>
     </properties>
 
     <body>
@@ -29,7 +32,8 @@
 
         #if (!$repository)
         <section key="template.cvs_usage.section1.title"
-            bundle="plugin-resources.templates.templates">
+            bundle="plugin-resources.templates.templates"
+            name="Repository">
             <p>
                 <message key="template.cvs_usage.section1.no_repository"
                     bundle="plugin-resources.templates.templates" />
@@ -39,7 +43,8 @@
           #if ($repository.url && $repository.url != '')
             #set ($url = $escape.getText($repository.url))
           <section key="template.cvs_usage.section2.title"
-              bundle="plugin-resources.templates.templates">
+              bundle="plugin-resources.templates.templates"
+              name="Web Access">
               <p>
                   <a href="$url">$url</a>
               </p>
@@ -54,7 +59,8 @@
                     #set ($module = $scmUtil.getCvsModule($repository.connection))
 
               <section key="template.cvs_usage.section3.title"
-                  bundle="plugin-resources.templates.templates">
+                  bundle="plugin-resources.templates.templates"
+                  name="Anonymous Access with Maven">
                   <p>
                       <message key="template.cvs_usage.section3.description"
                           bundle="plugin-resources.templates.templates" />
@@ -72,7 +78,8 @@
               </section>
 
               <section key="template.cvs_usage.section4.title"
-                  bundle="plugin-resources.templates.templates">
+                  bundle="plugin-resources.templates.templates"
+                  name="Anonymous CVS Access">
                   <p>
                       <message key="template.cvs_usage.section4.description"
                           bundle="plugin-resources.templates.templates" />
@@ -101,7 +108,8 @@
                     #set ($server = $scmUtil.getCvsServer($repository.developerConnection))
 
               <section key="template.cvs_usage.section5.title"
-                  bundle="plugin-resources.templates.templates">
+                  bundle="plugin-resources.templates.templates"
+                  name="Developer Access with Maven">
                   <p>
                       <message key="template.cvs_usage.section5.description"
                           bundle="plugin-resources.templates.templates" />
@@ -125,7 +133,8 @@
               </section>
 
               <section key="template.cvs_usage.section6.title"
-                  bundle="plugin-resources.templates.templates">
+                  bundle="plugin-resources.templates.templates"
+                  name="Developer CVS Access via SSH">
 
                   <p>
                       <message key="template.cvs_usage.section6.description"
@@ -152,7 +161,8 @@
                 
                 #if ($connscm == 'cvs')
               <section key="template.cvs_usage.section7.title"
-                  bundle="plugin-resources.templates.templates">
+                  bundle="plugin-resources.templates.templates"
+                  name="CVS Access behind a firewall">
 
                   <p>
                       <message key="template.cvs_usage.section7.description1"
diff --git a/xdoc/src/plugin-resources/templates/dependencies.xml b/xdoc/src/plugin-resources/templates/dependencies.xml
index 1463f375..1bd81389 100644
--- a/xdoc/src/plugin-resources/templates/dependencies.xml
+++ b/xdoc/src/plugin-resources/templates/dependencies.xml
@@ -21,12 +21,16 @@
 <document>
     <properties>
         <title key="template.dependencies.title"
-            bundle="plugin-resources.templates.templates" />
+            bundle="plugin-resources.templates.templates" >
+            <message key="template.dependencies.title"
+                bundle="plugin-resources.templates.templates" />
+        </title>
     </properties>
 
     <body>
         <section key="template.dependencies.section.title"
-            bundle="plugin-resources.templates.templates">
+            bundle="plugin-resources.templates.templates"
+            name="Dependencies">
             #if ($project.dependencies.size() == 0)
             <p>
                 <message key="template.dependencies.section.no_dependency"
diff --git a/xdoc/src/plugin-resources/templates/issue-tracking.xml b/xdoc/src/plugin-resources/templates/issue-tracking.xml
index e22d001f..69a7781c 100644
--- a/xdoc/src/plugin-resources/templates/issue-tracking.xml
+++ b/xdoc/src/plugin-resources/templates/issue-tracking.xml
@@ -21,12 +21,16 @@
 <document>
     <properties>
         <title key="template.issue_tracking.title"
-            bundle="plugin-resources.templates.templates" />
+            bundle="plugin-resources.templates.templates" >
+            <message key="template.issue_tracking.title"
+                bundle="plugin-resources.templates.templates" />
+        </title>
     </properties>
 
     <body>
         <section key="template.issue_tracking.section.title"
-            bundle="plugin-resources.templates.templates">
+            bundle="plugin-resources.templates.templates"
+            name="Issue Tracking">
             <p>
               #if ($project.issueTrackingUrl && $project.issueTrackingUrl != '')
                 #set ($url = $escape.getText($project.issueTrackingUrl))
diff --git a/xdoc/src/plugin-resources/templates/mail-lists.xml b/xdoc/src/plugin-resources/templates/mail-lists.xml
index 8be4a496..d10101ef 100644
--- a/xdoc/src/plugin-resources/templates/mail-lists.xml
+++ b/xdoc/src/plugin-resources/templates/mail-lists.xml
@@ -36,12 +36,16 @@
 <document>
     <properties>
         <title key="template.mail_lists.title"
-            bundle="plugin-resources.templates.templates" />
+            bundle="plugin-resources.templates.templates" >
+            <message key="template.mail_lists.title"
+                bundle="plugin-resources.templates.templates" />
+        </title>
     </properties>
 
     <body>
         <section key="template.mail_lists.section.title"
-            bundle="plugin-resources.templates.templates">
+            bundle="plugin-resources.templates.templates"
+            name="Mailing Lists">
             #if ($project.mailingLists.size() == 0)
             <p>
                 <message key="template.mail_lists.section.no_mail_list"
diff --git a/xdoc/src/plugin-resources/templates/maven-reports.xml b/xdoc/src/plugin-resources/templates/maven-reports.xml
index 03092c1b..ce9196ff 100644
--- a/xdoc/src/plugin-resources/templates/maven-reports.xml
+++ b/xdoc/src/plugin-resources/templates/maven-reports.xml
@@ -21,12 +21,16 @@
 <document>
     <properties>
         <title key="template.maven_reports.title"
-            bundle="plugin-resources.templates.templates" />
+            bundle="plugin-resources.templates.templates" >
+            <message key="template.maven_reports.title"
+                bundle="plugin-resources.templates.templates" />
+        </title>
     </properties>
 
     <body>
         <section key="template.maven_reports.section.title"
-            bundle="plugin-resources.templates.templates">
+            bundle="plugin-resources.templates.templates"
+            name="Maven Generated Reports">
             <p>
                 <message key="template.maven_reports.section.maven_reports1"
                     bundle="plugin-resources.templates.templates" />
@@ -39,7 +43,8 @@
             #set ($currentLocale = $project.getPluginContext('maven-xdoc-plugin').getVariable('currentLocale'))
 
             <subsection key="template.maven_reports.section.subsection.title"
-                bundle="plugin-resources.templates.templates">
+                bundle="plugin-resources.templates.templates"
+                name="Overview">
                 <table>
                     <tr>
                         <th>
diff --git a/xdoc/src/plugin-resources/templates/project-info.xml b/xdoc/src/plugin-resources/templates/project-info.xml
index 0cddd181..78c4baf1 100644
--- a/xdoc/src/plugin-resources/templates/project-info.xml
+++ b/xdoc/src/plugin-resources/templates/project-info.xml
@@ -21,12 +21,16 @@
 <document>
     <properties>
         <title key="template.project_info.title"
-            bundle="plugin-resources.templates.templates" />
+            bundle="plugin-resources.templates.templates" >
+            <message key="template.project_info.title"
+                bundle="plugin-resources.templates.templates" />
+        </title>
     </properties>
 
     <body>
         <section key="template.project_info.section.title"
-            bundle="plugin-resources.templates.templates">
+            bundle="plugin-resources.templates.templates"
+            name="General Project Information">
             <p>
                 <message key="template.project_info.section.project_information1"
                     bundle="plugin-resources.templates.templates" />
@@ -36,7 +40,8 @@
             </p>
 
             <subsection key="template.project_info.section.subsection.title"
-                bundle="plugin-resources.templates.templates">
+                bundle="plugin-resources.templates.templates"
+                name="Overview">
                 <table>
                     <tr>
                         <th>
diff --git a/xdoc/src/plugin-resources/templates/team-list.xml b/xdoc/src/plugin-resources/templates/team-list.xml
index c598f010..4c2e06a0 100644
--- a/xdoc/src/plugin-resources/templates/team-list.xml
+++ b/xdoc/src/plugin-resources/templates/team-list.xml
@@ -21,7 +21,10 @@
 <document>
     <properties>
         <title key="template.team_list.title"
-            bundle="plugin-resources.templates.templates" />
+            bundle="plugin-resources.templates.templates" >
+            <message key="template.team_list.title"
+                bundle="plugin-resources.templates.templates" />
+        </title>
     </properties>
 
     <head>
@@ -51,7 +54,8 @@
     <body onload="init();">
 
         <section key="template.team_list.section.title"
-            bundle="plugin-resources.templates.templates">
+            bundle="plugin-resources.templates.templates"
+            name="The Team">
             <p>
                 <message key="template.team_list.section.description1"
                     bundle="plugin-resources.templates.templates" />
@@ -63,7 +67,8 @@
             </p>
 
             <subsection key="template.team_list.section.members.title"
-                bundle="plugin-resources.templates.templates">
+                bundle="plugin-resources.templates.templates"
+                name="Members">
                 #if ($project.developers.size() == 0)
                   <p>
                       <message
@@ -151,7 +156,8 @@
             </subsection>
             <subsection
                 key="template.team_list.section.contributors.title"
-                bundle="plugin-resources.templates.templates">
+                bundle="plugin-resources.templates.templates"
+                name="Contributors">
                 #if ($project.contributors.size() == 0)
                 <p>
                     <message key="template.team_list.section.no_contributor"
diff --git a/xdoc/src/plugin-resources/templates/templates.properties b/xdoc/src/plugin-resources/templates/templates.properties
index db43cc9e..f4091195 100644
--- a/xdoc/src/plugin-resources/templates/templates.properties
+++ b/xdoc/src/plugin-resources/templates/templates.properties
@@ -106,7 +106,7 @@ template.project_info.section.subsection.document.issue_tracking=Issue Tracking
 template.project_info.section.subsection.description.issue_tracking=This is a link to the issue tracking system for this project.  Issues (bugs, features, change requests) can be created and queried using this link.
 
 # For team-list.xml
-template.team_list.title=Team list
+template.team_list.title=Project Team
 template.team_list.section.title=The Team
 template.team_list.section.description1=A successful project requires many people to play many roles. Some members write code or documentation, while others are valuable as testers, submitting patches and suggestions.
 template.team_list.section.description2=The team is comprised of Members and Contributors. Members have direct access to the source of a project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project are greatly appreciated.
diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml
index c6049ec1..3d682268 100644
--- a/xdoc/xdocs/changes.xml
+++ b/xdoc/xdocs/changes.xml
@@ -26,6 +26,7 @@
   </properties>
   <body>
     <release version="1.9.2-SNAPSHOT" date="In SVN">
+      <action dev="aheritier" type="fix" issue="MPXDOC-155" due-to="Lukas Theussl">Xdoc plugin >= 1.9 not compatible with older customised site.jsl.</action>
       <action dev="aheritier" type="fix" issue="MPXDOC-154" due-to="Juan F. Codagnone,Vincent Siveton,Lukas Theussl">System locale setting makes test cases fail.</action>
       <action dev="vsiveton" type="fix" issue="MPXDOC-152" due-to="Arnaud Heritier">cvs-usage link not shown in project-info page</action>
       <action dev="aheritier" type="fix" issue="MPXDOC-151">i18n : menu tag in xdoc does not work with "key" translated text id.</action>