diff --git a/javadoc/plugin.jelly b/javadoc/plugin.jelly
index 1ea59eab..606cc65b 100644
--- a/javadoc/plugin.jelly
+++ b/javadoc/plugin.jelly
@@ -181,7 +181,7 @@
           <ant:setProperty name="doclet" value="${maven.javadoc.doclet}" />
         </j:if>
         <j:if test="${context.getVariable('maven.javadoc.docletpath') != null}">
-          <ant:setProperty name="doclet" value="${maven.javadoc.docletpath}" />
+          <ant:setProperty name="docletpath" value="${maven.javadoc.docletpath}" />
         </j:if>
         
         <!-- allow custom tags -->    
diff --git a/javadoc/xdocs/changes.xml b/javadoc/xdocs/changes.xml
index 0a2a49c0..626bcdee 100644
--- a/javadoc/xdocs/changes.xml
+++ b/javadoc/xdocs/changes.xml
@@ -9,7 +9,10 @@
   <body>
   
     <release version="1.4" date="in CVS">
-      <action dev="dion" type="update">
+      <action dev="dion" type="fix">
+        Apply MPJAVADOC-6.
+      </action>
+      <action dev="dion" type="fix">
         Apply MPJAVADOC-17.
       </action>
       <action dev="jvanzyl" type="update">
