diff --git a/xdoc/project.xml b/xdoc/project.xml
index 5cbf9b3a..6574f543 100644
--- a/xdoc/project.xml
+++ b/xdoc/project.xml
@@ -23,7 +23,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-xdoc-plugin</id>
   <name>Maven XDoc Plugin</name>
-  <currentVersion>1.10.1</currentVersion>
+  <currentVersion>1.10.2-SNAPSHOT</currentVersion>
   <description>Convert xdocs into HTML.</description>
   <shortDescription>Convert xdocs into HTML</shortDescription>
   <versions>
diff --git a/xdoc/src/plugin-resources/site.jsl b/xdoc/src/plugin-resources/site.jsl
index 3c23a790..0dc48848 100644
--- a/xdoc/src/plugin-resources/site.jsl
+++ b/xdoc/src/plugin-resources/site.jsl
@@ -655,16 +655,18 @@
 
   <!-- Process additional powered-by's -->
   <jsl:template match="powered-by" trim="true">
+    <span id="poweredByExternal">
     <x:forEach var="link" select="item">
       <x:set var="poweredbyimage" select="string(@img)"/>
       <x:set var="poweredbytitle" select="string(@name)"/>
       <x:set var="poweredbyurl" select="string(@href)"/>
       <j:if test="${!empty(poweredbyimage)}">
-        <a id="poweredByExternal" href="${poweredbyurl}" title="${poweredbytitle}">
+        <a href="${poweredbyurl}" title="${poweredbytitle}">
           <img alt="${poweredbytitle}" src="${poweredbyimage}" />
         </a>
       </j:if>
     </x:forEach>
+    </span>
    </jsl:template>
 
   <!-- Process the links navbar -->
diff --git a/xdoc/src/plugin-resources/sitemap.jsl b/xdoc/src/plugin-resources/sitemap.jsl
index 9e1796d8..3f7a862d 100644
--- a/xdoc/src/plugin-resources/sitemap.jsl
+++ b/xdoc/src/plugin-resources/sitemap.jsl
@@ -37,6 +37,40 @@
                   bundle="plugin-resources.templates.templates" />
               </title>
             </properties>
+            <head>
+              <style type="text/css">
+h5 {
+    font-size: smaller;
+    border-bottom: 1px solid #aaaaaa;
+    padding-top: 2px;
+    padding-left: 9px;
+    color: #49635a;
+    background-image: url(../images/h5.jpg);
+    background-repeat: no-repeat;
+    background-position: left bottom;
+}
+ul {
+    padding: 0;
+    margin: 5px 0 15px -0em;
+}
+ul ul {
+    margin: 0px 0 0px -0em;
+}
+li {
+    list-style-type: none;
+    background-image: none;
+    background-repeat: no-repeat;
+    background-position: 0 0.4em;
+    padding-left: 16px;
+    list-style-position: outside;
+    line-height: 1.2em;
+    font-size: smaller;
+}
+li.expanded {
+    background-image: url(images/expanded.gif);
+}
+              </style>
+            </head>
             <body>
                 <j:set var="name"><x:expr select="@name"/></j:set>
                 <section key="sitemap.section.title"
@@ -51,7 +85,6 @@
 
     <jsl:template match="menu" trim="true">
       <x:set var="currentMenu" select="." />
-      <div id="navcolumn">
           <x:if select="$currentMenu/@name and not($currentMenu/@key)">
             <h5><x:expr select="string(@name)"/></h5>
           </x:if>
@@ -68,7 +101,6 @@
             </h5>
           </x:if>
          <ul><jsl:applyTemplates select="item"/></ul>
-       </div>
      </jsl:template>
 
     <jsl:template match="item">
diff --git a/xdoc/src/plugin-resources/templates/team-list.xml b/xdoc/src/plugin-resources/templates/team-list.xml
index e320ecc5..e60c4307 100644
--- a/xdoc/src/plugin-resources/templates/team-list.xml
+++ b/xdoc/src/plugin-resources/templates/team-list.xml
@@ -233,10 +233,8 @@
                             </td>
                             <td>$!contributor.timezone</td>
                             <td>
-                                <span id="contributor-$contributor.name">
-                                    <message key="template.team_list.section.developer.timezone.unknown"
-                                        bundle="plugin-resources.templates.templates" />
-                                </span>
+                                <message key="template.team_list.section.developer.timezone.unknown"
+                                    bundle="plugin-resources.templates.templates" />
                             </td>
                         </tr>
                         #end
diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml
index 94f92be9..7ed33f68 100644
--- a/xdoc/xdocs/changes.xml
+++ b/xdoc/xdocs/changes.xml
@@ -28,6 +28,9 @@
     <author email="shinobu@apache.org">Shinobu Kawai</author> 
   </properties>  
   <body> 
+    <release version="1.10.2-SNAPSHOT" date="in SVN"> 
+      <action dev="ltheussl" type="fix" issue="MPXDOC-204">Plugin produces invalid xhtml.</action>  
+    </release>  
     <release version="1.10.1" date="2007-05-07"> 
       <action dev="shinobu" type="fix" issue="MPXDOC-200" due-to="Benoit Xhenseval">maven-xdoc-plugin-1.10.1-SNAPSHOT fails under JDK 6</action>  
       <action dev="aheritier" type="add" issue="MPXDOC-203">New 'Built by Maven' logos - default changed to mavenlogo_builtby_w.png</action>  
