diff --git a/javadoc/plugin.jelly b/javadoc/plugin.jelly
index 208d9ff9..1ebbfc41 100644
--- a/javadoc/plugin.jelly
+++ b/javadoc/plugin.jelly
@@ -264,10 +264,38 @@
       <ant:record name="${maven.build.dir}/javadoc/report.txt" action="stop" />
 
       <j:set var="genDocs" value="${maven.gen.docs}" />
+      
+      <!-- load file in order to remove absolute paths -->
+      <util:file name="${maven.build.dir}/javadoc/report.txt" var="inputFileObject"/>
+      <util:loadText var="inputText" file="${inputFileObject}"/>
+    
+      <!-- remove [javadoc] prefix from rows -->
+      <j:invokeStatic var="inputText" className="org.apache.commons.lang.StringUtils" method="replace">
+        <j:arg type="java.lang.String" value="${inputText}" />
+        <j:arg type="java.lang.String" value="[javadoc] " />
+        <j:arg type="java.lang.String" value="" />
+      </j:invokeStatic>
+    
+      <!-- trim path to basedir/ -->
+      <j:set var="pathToTrim">${basedir}${file.separator}</j:set>
+      <j:invokeStatic var="inputText" className="org.apache.commons.lang.StringUtils" method="replace">
+        <j:arg type="java.lang.String" value="${inputText}" />
+        <j:arg type="java.lang.String" value="${pathToTrim}" />
+        <j:arg type="java.lang.String" value="" />
+      </j:invokeStatic>
+      
+      <!-- trim path to maven home (stylesheet copy) -->
+      <j:set var="pathToTrim">${maven.home}${file.separator}</j:set>
+      <j:invokeStatic var="inputText" className="org.apache.commons.lang.StringUtils" method="replace">
+        <j:arg type="java.lang.String" value="${inputText}" />
+        <j:arg type="java.lang.String" value="${pathToTrim}" />
+        <j:arg type="java.lang.String" value="" />
+      </j:invokeStatic>
+
       <doc:text-xdoc
         title="Javadoc Report"
         section="Javadoc Report"
-        inputFile="${maven.build.dir}/javadoc/report.txt"
+        inputText="${inputText}"
         output="${genDocs}/javadoc.xml"/>
     </j:if>
 
diff --git a/javadoc/project.xml b/javadoc/project.xml
index 06d69be7..393b60b0 100644
--- a/javadoc/project.xml
+++ b/javadoc/project.xml
@@ -94,7 +94,7 @@
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>1.0.1</version>
+      <version>2.0</version>
     </dependency>
   </dependencies>
   <versions>
diff --git a/javadoc/xdocs/changes.xml b/javadoc/xdocs/changes.xml
index cc5b1e0e..df034486 100644
--- a/javadoc/xdocs/changes.xml
+++ b/javadoc/xdocs/changes.xml
@@ -25,6 +25,12 @@
     <author email="evenisse@ifrance.com">Emmanuel Venisse</author>
   </properties>
   <body>
+    <release version="1.5" date="in CVS">
+      <action dev="dion" type="fix" issue="MPJAVADOC-22" due-to="fabrizio giustina">
+        trim absolute paths to basedir in javadoc report, remove [javadoc] banner
+      </action>
+    </release>
+    
     <release version="1.4" date="2004-03-07">
       <action dev="evenisse" type="fix" issue="MPJAVADOC-19">Prevent the plugin from failing when a sourceDirectory exists, but it does not contain Java files.</action>
       <action dev="dion" type="fix" issue="MPJAVADOC-6"/>