diff --git a/javadoc/plugin.jelly b/javadoc/plugin.jelly
index 1ad9b351..8812eacd 100644
--- a/javadoc/plugin.jelly
+++ b/javadoc/plugin.jelly
@@ -63,8 +63,6 @@
       <ant:property name="copyright"
         value="Copyright &amp;copy; ${year} ${pom.organization.name}. All Rights Reserved." />
 
-      <ant:property name="title" value="${pom.name} ${pom.currentVersion} API"/>
-
       <!-- calculate online/offline mode -->
       <j:set var="online" value="${maven.javadoc.mode.online}"/>
       <j:if test="${empty(online)}">
@@ -100,8 +98,8 @@
         private="${maven.javadoc.private}"
         version="${maven.javadoc.version}"
         use="${maven.javadoc.use}"
-        windowtitle="${title}"
-        doctitle="${title}"
+        windowtitle="${maven.javadoc.windowtitle}"
+        doctitle="${maven.javadoc.windowtitle}"
         bottom="${copyright}"
         stylesheetfile="${maven.javadoc.stylesheet}"
         additionalparam="${maven.javadoc.additionalparam}"
diff --git a/javadoc/plugin.properties b/javadoc/plugin.properties
index f12de2f2..8781f267 100644
--- a/javadoc/plugin.properties
+++ b/javadoc/plugin.properties
@@ -20,5 +20,6 @@ maven.javadoc.stylesheet = ${plugin.resources}/stylesheet.css
 maven.javadoc.use = true
 maven.javadoc.version = true
 maven.javadoc.useexternalfile = no
+maven.javadoc.windowtitle = ${pom.name} ${pom.currentVersion} API
 
 maven.docs.outputencoding = ISO-8859-1
diff --git a/javadoc/project.xml b/javadoc/project.xml
index 856527c2..0d1cbf64 100644
--- a/javadoc/project.xml
+++ b/javadoc/project.xml
@@ -62,7 +62,15 @@
         <role>Jelly Developer</role>
       </roles>
     </developer>
-    
+    <developer>
+      <name>Vincent Massol</name>
+      <id>vmassol</id>
+      <email>vmassol@pivolis.com</email>
+      <organization>Pivolis</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>  
   </developers>
   <dependencies>
     <dependency>
diff --git a/javadoc/xdocs/properties.xml b/javadoc/xdocs/properties.xml
index 69f8354e..bd761c0c 100644
--- a/javadoc/xdocs/properties.xml
+++ b/javadoc/xdocs/properties.xml
@@ -187,10 +187,10 @@ maven.javadoc.offlineLinks=http://java.sun.com/j2se/1.4.2/docs/api/#/opt/java-ap
           <td>Yes</td>
           <td>
             Specifies the window title to use for the generated
-            Javadocs.  The default value is <code>${maven.name}
-            ${maven.currentVersion} API</code>.  <code>${maven.name}</code>
-            and <code>${maven.currentVersion}</code> expand to values obtained
-            from the project descriptor.
+            Javadocs.  The default value is
+            <code>${pom.name} ${pom.currentVersion} API</code>.
+            <code>${pom.name}</code> and <code>${maven.currentVersion}</code> 
+            expand to values obtained from the project descriptor.
           </td>
         </tr>
         <tr>