diff --git a/xdoc/project.properties b/xdoc/project.properties
index 4833d7d2..e3736cdb 100644
--- a/xdoc/project.properties
+++ b/xdoc/project.properties
@@ -21,3 +21,4 @@ maven.junit.fork=yes
 
 maven.jar.override = on
 maven.jar.maven = ${maven.home}/lib/maven.jar
+maven.xdoc.date=bottom
diff --git a/xdoc/project.xml b/xdoc/project.xml
index 9a2e5513..ea5b4bb8 100644
--- a/xdoc/project.xml
+++ b/xdoc/project.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -96,8 +96,7 @@
     <developer>
       <name>Michal Maczka</name>
       <id>mmaczka</id>
-      <email>michal.maczka@dimatics.com</email>
-      <organization>Dimatics</organization>
+      <email>michal@codehaus.org</email>      
       <roles>
         <role>Java Developer</role>
       </roles>
diff --git a/xdoc/src/plugin-resources/site.jsl b/xdoc/src/plugin-resources/site.jsl
index 8789958a..4a2f95b0 100644
--- a/xdoc/src/plugin-resources/site.jsl
+++ b/xdoc/src/plugin-resources/site.jsl
@@ -151,33 +151,43 @@
       </div>
 
       <div id="breadcrumbs">
-        <maven:property var="version" name="maven.xdoc.version" defaultValue="${pom.currentVersion}"/>
-        <j:if test="${date == 'left'}">
-          <div class="xleft">
-            Last published: ${build.date}
-            <j:if test="${!empty(version)}">
-              <j:if test="${!(maven.xdoc.crumb.separator == '')}">
-                <span class="separator">${maven.xdoc.crumb.separator}</span>
-              </j:if>
-              Doc for ${version}
-            </j:if>
-          </div>
-        </j:if>
+        <maven:property var="version" name="maven.xdoc.version" defaultValue="${pom.currentVersion}"/>                
+                
+        <j:set var="breadcrumbsUsed" value=""/>  
+        <x:if select="$nav/body/breadcrumbs">
+          <j:set var="breadcrumbsUsed" value="'true'"/>  
+        </x:if>
+                      
+        <div class="xleft">
+	        <j:if test="${empty(breadcrumbsUsed)}">	        	          
+	          <j:if test="${date == 'left'}">	      
+	              Last published: ${build.date}
+	              <j:if test="${!empty(version)}">
+	                <j:if test="${!(maven.xdoc.crumb.separator == '')}">
+	                  <span class="separator">${maven.xdoc.crumb.separator}</span>
+	                </j:if>
+	                Doc for ${version}
+	              </j:if>	          
+	          </j:if>
+	        </j:if>  	        
+	        <j:if test="${!empty( breadcrumbsUsed )}">	        
+             <jsl:applyTemplates select="$nav/body/breadcrumbs" />
+             ${pom.name} <span class="separator">&gt;</span> ${docTitle}   
+          </j:if>             
+        </div>
+                             
         <div class="xright">
-          <j:if test="${date == 'right'}">
-            Last published: ${build.date}
-            <j:if test="${!empty(version)}">
-              <j:if test="${!(maven.xdoc.crumb.separator == '')}">
-                <span class="separator">${maven.xdoc.crumb.separator}</span>
-              </j:if>
-              Doc for ${version}
-            </j:if>
-            <x:if select="$nav/body/links">
-              <j:if test="${!(maven.xdoc.crumb.separator == '')}">
-                <span class="separator">${maven.xdoc.crumb.separator}</span>
-              </j:if>
-            </x:if>
-          </j:if>
+          <j:if test="${empty(breadcrumbsUsed)}">	
+            <j:if test="${date == 'right'}">
+              Last published: ${build.date}
+              <j:if test="${!empty(version)}">
+                <j:if test="${!(maven.xdoc.crumb.separator == '')}">
+                  <span class="separator">${maven.xdoc.crumb.separator}</span>
+                </j:if>
+                Doc for ${version}
+             </j:if>
+            </j:if> 
+          </j:if>	
           <!-- render links -->
           <x:if select="$nav/body/links">
             <jsl:applyTemplates select="$nav/body/links" />
@@ -188,10 +198,7 @@
         
       <!-- left column start -->
       <div id="leftColumn">
-        <div id="navcolumn">
-          <j:if test="${date == 'navigation-top'}">
-            <div id="lastPublished">Last published: ${build.date}</div>
-          </j:if>
+        <div id="navcolumn">          
           <x:if select="$nav">
             <jsl:applyTemplates select="$nav/body/menu[not(@type) | @type='header'] | $nav/body/search"/>
           </x:if>
@@ -218,10 +225,12 @@
             <a id="poweredBy" href="${poweredbyurl}" title="${poweredbytitle}">
               <img alt="${maven.xdoc.poweredby.title}" src="${relativePath}/images/logos/${poweredbyimage}" />
             </a>
-          </j:if>
-          <j:if test="${date == 'navigation-bottom'}">
-            <div id="lastPublished">Last published: ${build.date}</div>
-          </j:if>
+          </j:if> 
+          <j:if test="${empty( breadcrumbsUsed )}">	    
+            <j:if test="${date == 'navigation-bottom'}">
+               <div id="lastPublished">Last published: ${build.date}</div>
+            </j:if>       
+          </j:if>  
         </div>
       </div>
       <!-- left column end -->
@@ -238,6 +247,14 @@
       <!-- footer start -->    
       <div id="footer">  
         <jsl:applyTemplates select="$nav/body/footer"/>
+        
+       
+       
+       <j:if test="${!empty(breadcrumbsUsed)}">	                  
+          <div class="xleft">          
+             <div id="lastPublished">Last published: ${build.date} Doc for ${pom.currentVersion}</div>                      
+          </div>
+        </j:if>
         <div class="xright">
           <j:if test="${!empty(pom.organization.name)}">
             <j:if test="${!empty(pom.inceptionYear)}">
@@ -250,11 +267,14 @@
             </j:if>
             <j:if test="${empty(pom.inceptionYear)}">
               &#169; ${mavenCurrentYear}, ${pom.organization.name}
-            </j:if>
-          </j:if>
-          <j:if test="${date == 'bottom'}">
-            &#169; - Last published: ${build.date}
-          </j:if>
+            </j:if> 
+           <j:if test="${empty(breadcrumbsUsed)}">	
+             <j:if test="${date == 'bottom'}">
+               - Last published: ${build.date}
+             </j:if>
+           </j:if>
+  
+          </j:if>                      
         </div>
         <div class="clear"><hr /></div>
       </div>
@@ -356,6 +376,18 @@
       <j:set var="linkCount" value="${1+linkCount}"/>
     </x:forEach>
   </jsl:template>
+  
+  
+    <!-- Process the breadcrumb navbar -->
+  <jsl:template match="breadcrumbs" trim="true">    
+    <x:forEach var="link" select="item">
+      <j:set var="_name"><x:expr select="@name"/></j:set>
+      <j:set var="_link"><x:expr select="@href"/></j:set>     
+      <a href="${_link}">${_name}</a>
+      <span class="separator">&gt;</span>           
+    </x:forEach>
+  </jsl:template>
+  
 
   <!-- Process a menu for the navigation bar -->
   <jsl:template match="menu" trim="true">
diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml
index eb82855f..67e78c61 100644
--- a/xdoc/xdocs/changes.xml
+++ b/xdoc/xdocs/changes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -35,8 +35,8 @@
       <action dev="aheritier" type="fix" issue="MPXDOC-117" due-to="Dennis Lundberg">Show version if maven.xdoc.date=right</action>
       <action dev="aheritier" type="fix" issue="MPXDOC-115" due-to="Brent Worden">Allow header images and links to use relative paths</action>
       <action dev="carlos" type="add" issue="MPFAQ-11">Added dt css style</action>
-      <action dev="brett" type="add">Add a legend for the symbols in the xdoc, disabled by setting <code>maven.xdoc.legend=false</code>
-      </action>
+      <action dev="brett" type="add">Add a legend for the symbols in the xdoc, disabled by setting <code>maven.xdoc.legend=false</code></action>
+      <action dev="michal" type="add">Add a support for "hierarchical" site navigation in breadcrumbs</action>
     </release>
     <release version="1.8" date="2004-07-10">
       <action dev="brett" type="add">Add an externalLink attribute to a report to use if link is not present</action>
diff --git a/xdoc/xdocs/index.xml b/xdoc/xdocs/index.xml
index 483597f3..fe3ba5d9 100644
--- a/xdoc/xdocs/index.xml
+++ b/xdoc/xdocs/index.xml
@@ -23,7 +23,7 @@
 <document>
 
   <properties>
-    <title>Maven XDoc Plug-in</title>
+    <title>About</title>
     <author email="jason@zenplex.com">Jason van Zyl</author>
   </properties>
 
diff --git a/xdoc/xdocs/navigation.xml b/xdoc/xdocs/navigation.xml
index 02995052..6d7ab659 100644
--- a/xdoc/xdocs/navigation.xml
+++ b/xdoc/xdocs/navigation.xml
@@ -22,8 +22,12 @@
   <title>Maven xdoc Plugin</title>
 
   <body>
+    <breadcrumbs>
+      <item name="Maven" href="http://maven.apache.org"/>
+      <item name="Maven Plugins" href="http://maven.apache.org/reference/plugins/index.html"/>
+    </breadcrumbs>
     <links>
-      <item name="Maven"  href="http://maven.apache.org/"/>
+      <item name="Anakaia Tags"  href="http://jakarta.apache.org/site/jakarta-site2.html"/>
     </links>
     <menu name="Overview">
       <item name="Goals"             href="/goals.html"/>