diff --git a/xdoc/src/plugin-resources/site.jsl b/xdoc/src/plugin-resources/site.jsl
index 7aaa2481..7f320ae8 100644
--- a/xdoc/src/plugin-resources/site.jsl
+++ b/xdoc/src/plugin-resources/site.jsl
@@ -287,8 +287,13 @@
             </j:if>             
           </div>
 
+          <j:set var="linksUsed" value=""/>
+          <x:if select="$nav/body/links">
+            <j:set var="linksUsed" value="'true'"/>
+          </x:if>
+
           <div class="xright">
-            <j:if test="${empty(breadcrumbsUsed)}">
+            <j:if test="${empty(linksUsed)}">
               <j:if test="${date == 'right'}">
                 <fmt:message key="site.last_published" bundle="${msg}"/>: ${build.date}
                 <j:if test="${!empty(version)}">
@@ -300,9 +305,9 @@
               </j:if>
             </j:if>
             <!-- render links -->
-            <x:if select="$nav/body/links">
+            <j:if test="${!empty(linksUsed)}">
               <jsl:applyTemplates select="$nav/body/links"/>
-            </x:if>
+            </j:if>
           </div>
           <div class="clear"><hr /></div>
         </div>
@@ -310,6 +315,16 @@
         <!-- left column start -->
         <div id="leftColumn">
           <div id="navcolumn">
+            <j:if test="${date == 'navigation-top'}">
+              <div id="lastPublished"><fmt:message key="site.last_published" bundle="${msg}"/>: ${build.date}
+                <j:if test="${!empty(version)}">
+                  <j:if test="${!(maven.xdoc.crumb.separator == '')}">
+                    <span class="separator">${maven.xdoc.crumb.separator}</span>
+                  </j:if>
+                  &#160;<fmt:message key="site.doc_for" bundle="${msg}"/> ${version}
+                </j:if>
+              </div>
+            </j:if>
             <x:if select="$nav">
               <jsl:applyTemplates 
                 select="$nav/body/menu[@type='header'] |
@@ -420,11 +435,16 @@
                 <img alt="${maven.xdoc.poweredby.title}" src="${relativePathForLocale}images/logos/${poweredbyimage}" />
               </a>
             </j:if>
-          <j:if test="${empty( breadcrumbsUsed )}">
             <j:if test="${date == 'navigation-bottom'}">
-              <div id="lastPublished"><fmt:message key="site.last_published" bundle="${msg}"/>: ${build.date}</div>
+              <div id="lastPublished"><fmt:message key="site.last_published" bundle="${msg}"/>: ${build.date}
+                <j:if test="${!empty(version)}">
+                  <j:if test="${!(maven.xdoc.crumb.separator == '')}">
+                    <span class="separator">${maven.xdoc.crumb.separator}</span>
+                  </j:if>
+                  &#160;<fmt:message key="site.doc_for" bundle="${msg}"/> ${version}
+                </j:if>
+              </div>
             </j:if>
-          </j:if>  
           </div>
         </div>
         <!-- left column end -->
@@ -442,7 +462,7 @@
         <div id="footer">  
           <jsl:applyTemplates select="$nav/body/footer"/>
        
-          <j:if test="${!empty(breadcrumbsUsed)}">
+          <j:if test="${date == 'bottom'}">
             <div class="xleft">
               <fmt:message key="site.last_published" bundle="${msg}"/>: ${build.date}
               <j:if test="${!empty(version)}">
@@ -466,12 +486,7 @@
               <j:if test="${empty(pom.inceptionYear)}">
                 &#169; ${mavenCurrentYear}, ${pom.organization.name}
               </j:if>
-              <j:if test="${empty(breadcrumbsUsed)}">
-                <j:if test="${date == 'bottom'}">
-                  &#169; - <fmt:message key="site.last_published" bundle="${msg}"/>: ${build.date}
-                </j:if>
-              </j:if>
-            </j:if>                      
+            </j:if>
           </div>
           <div class="clear"><hr /></div>
         </div>
diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml
index 27b53250..a48963c2 100644
--- a/xdoc/xdocs/changes.xml
+++ b/xdoc/xdocs/changes.xml
@@ -27,6 +27,7 @@
   </properties>
   <body>
     <release version="1.10-SNAPSHOT" date="in SVN">
+      <action dev="ltheussl" type="fix" issue="MPXDOC-185">Fix broken <code>maven.xdoc.date=navigation-top</code> and <code>navigation-bottom</code>.</action>
       <action dev="ltheussl" type="add" issue="MPXDOC-183" due-to="Niall Pemberton">Enable user-defined custom templates.</action>
       <action dev="ltheussl" type="fix" issue="MPXDOC-187">Correct cvs checkout instructions on cvs-usage page.</action>
       <action dev="ltheussl" type="fix" issue="MPXDOC-125" due-to="Shinobu Kawai Yoshida">Url and timezone not used for contributor.</action>
diff --git a/xdoc/xdocs/properties.xml b/xdoc/xdocs/properties.xml
index 5f93d0c2..3a73c1e1 100644
--- a/xdoc/xdocs/properties.xml
+++ b/xdoc/xdocs/properties.xml
@@ -304,11 +304,11 @@
             Allows the user to show the site generation date on the generated 
             website. One can place the date in 5 locations with "maven.xdoc.date":
             <ul>
-              <li>left : on the left side of the breadcrumbs</li>
-              <li>right : on the right side of the breadcrumbs, before the links</li>
+              <li>left : at the place of the breadcrumbs (only if there are no breadcrumbs)</li>
+              <li>right : at the place of the links (only if there are no links)</li>
               <li>navigation-top : above the user links, in the navigation menu</li>
-              <li>navigation-bottom : under Maven's links, in the navigation menu</li>
-              <li>bottom : after the organization name, in the footer</li>
+              <li>navigation-bottom : below Maven's links, in the navigation menu</li>
+              <li>bottom : on the left side in the footer</li>
             </ul>
             If "maven.xdoc.date" is left empty, no date is shown on the site (default).
           </td>
@@ -317,11 +317,10 @@
           <td>maven.xdoc.version</td>
           <td>Yes</td>
           <td>
-            The version number to show next to the date. <b>This only works if you also set
-            <code>maven.xdoc.date</code> to either <code>left</code> or <code>right</code>.</b>
-            By default, <code>maven.xdoc.version</code> isn't setted and the value of 
+            The version number to show next to the date.
+            By default, <code>maven.xdoc.version</code> is not set and the value of 
             <code>pom.currentVersion</code> is displayed.
-            If <code>maven.xdoc.version</code> is setted to empty, no version is shown on the site.
+            If <code>maven.xdoc.version</code> is set to empty, no version is shown on the site.
           </td>
         </tr>
         <tr>
