diff -Naur maven-plugins/javadoc/plugin.jelly maven-plugins-new/javadoc/plugin.jelly
--- maven-plugins/javadoc/plugin.jelly	2004-09-26 15:49:11.000000000 +0200
+++ maven-plugins-new/javadoc/plugin.jelly	2005-04-07 16:40:06.652335824 +0200
@@ -82,6 +82,8 @@
 maven.javadoc.bottom              = [${maven.javadoc.bottom}]
 maven.javadoc.customtags          = [${maven.javadoc.customtags}]
 maven.javadoc.destdir             = [${maven.javadoc.destdir}]
+maven.javadoc.footer              = [${maven.javadoc.footer}]
+maven.javadoc.header              = [${maven.javadoc.header}]
 maven.javadoc.links               = [${maven.javadoc.links}]
 maven.javadoc.offlineLinks        = [${maven.javadoc.offlineLinks}]
 maven.javadoc.mode.online         = [${maven.javadoc.mode.online}]
@@ -410,6 +412,14 @@
             <ant:setProperty name="bottom" value="${maven.javadoc.bottom}" />
           </j:if>
   
+          <j:if test="${context.getVariable('maven.javadoc.footer') != null and !context.getVariable('maven.javadoc.footer').equals('')}">
+            <ant:setProperty name="footer" value="${maven.javadoc.footer}" />
+          </j:if>
+          
+          <j:if test="${context.getVariable('maven.javadoc.header') != null and !context.getVariable('maven.javadoc.header').equals('')}">
+            <ant:setProperty name="header" value="${maven.javadoc.header}" />
+          </j:if>
+
           <!-- Process/Parse links -->
           <!-- This code allows to specify a packagelistLoc even when in online mode -->
           <j:forEach var="link" items="${links}">
diff -Naur maven-plugins/javadoc/plugin.properties maven-plugins-new/javadoc/plugin.properties
--- maven-plugins/javadoc/plugin.properties	2004-09-24 23:37:36.000000000 +0200
+++ maven-plugins-new/javadoc/plugin.properties	2005-04-07 16:18:05.126238328 +0200
@@ -26,6 +26,8 @@
 #maven.javadoc.customtags           =
 maven.javadoc.debug                 = false
 maven.javadoc.destdir               = ${maven.docs.dest}/apidocs
+maven.javadoc.footer                =
+maven.javadoc.header                =
 
 # optional properties for specifying a custom doclet
 #maven.javadoc.doclet               =
diff -Naur maven-plugins/javadoc/xdocs/properties.xml maven-plugins-new/javadoc/xdocs/properties.xml
--- maven-plugins/javadoc/xdocs/properties.xml	2004-09-26 15:51:04.000000000 +0200
+++ maven-plugins-new/javadoc/xdocs/properties.xml	2005-04-07 16:25:23.196641504 +0200
@@ -195,6 +195,24 @@
           </td>
         </tr>
         <tr>
+          <td>maven.javadoc.footer</td>
+          <td>Yes</td>
+          <td>
+            Specifies the text or html fragment to be placed to the right of the bottom navigation bar
+            on all pages. The default is to not have a footer. If the footer is not set,
+            but the header is, then Javadoc will user the header in both places.
+          </td>
+        </tr>
+        <tr>
+          <td>maven.javadoc.header</td>
+          <td>Yes</td>
+          <td>
+            Specifies the text or html fragment to be placed at the top of the navigation frame in the upper-left corner,
+            and to the right of the top navigation bar on all pages. The default is to not have a header.
+            Javadoc will be use this as the footer as well if the footer is not set explicitly.
+          </td>
+        </tr>
+        <tr>
           <td>maven.javadoc.links</td>
           <td>Yes</td>
           <td>