diff --git a/javadoc/plugin.jelly b/javadoc/plugin.jelly
index 8812eacd..24fb0a1b 100644
--- a/javadoc/plugin.jelly
+++ b/javadoc/plugin.jelly
@@ -193,6 +193,13 @@
                enabled="${enabled}" scope="${scope}"/>
         </j:forEach>
 
+        <!-- allow taglets -->
+        <util:tokenize var="listOfTaglets" delim="," trim="true">${maven.javadoc.taglets}</util:tokenize>
+        <j:set var="tagletPath" value="${context.getVariable('maven.javadoc.tagletpath')}" />
+        <j:forEach var="someTaglet" items="${listOfTaglets}">
+              <ant:taglet name="${someTaglet}" path="${tagletPath}" />
+        </j:forEach>
+
       </ant:javadoc>
       <ant:record name="${maven.build.dir}/javadoc/report.txt" action="stop" />
 
diff --git a/javadoc/project.xml b/javadoc/project.xml
index ab689f79..df81c1cf 100644
--- a/javadoc/project.xml
+++ b/javadoc/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-javadoc-plugin</id>
   <name>Maven Javadoc Plug-in</name>
-  <currentVersion>1.3</currentVersion>
+  <currentVersion>1.4-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>Produce Javadocs and report</shortDescription>
   <url>http://maven.apache.org/reference/plugins/javadoc/</url>
diff --git a/javadoc/xdocs/changes.xml b/javadoc/xdocs/changes.xml
index cdd67049..ebdb0350 100644
--- a/javadoc/xdocs/changes.xml
+++ b/javadoc/xdocs/changes.xml
@@ -7,6 +7,13 @@
   </properties>
 
   <body>
+  
+    <release version="1.4" date="in CVS">
+      <action dev="dion" type="add">
+        Applied MAVEN-894. Allow custom taglets.
+      </action>
+    </release>
+  
     <release version="1.3" date="2003-09-29">
       <action dev="evenisse" type="add">
         MAVEN-639. Add maven.javadoc.overview property.
diff --git a/javadoc/xdocs/properties.xml b/javadoc/xdocs/properties.xml
index bd761c0c..f4e88c4d 100644
--- a/javadoc/xdocs/properties.xml
+++ b/javadoc/xdocs/properties.xml
@@ -164,6 +164,28 @@ maven.javadoc.offlineLinks=http://java.sun.com/j2se/1.4.2/docs/api/#/opt/java-ap
             ant javadoc task</a> documentation for more detail.
           </td>
         </tr>
+        <tr>
+          <td>maven.javadoc.taglets</td>
+          <td>Yes</td>
+          <td>
+            Comma separated list of taglet classes to use when calling javadoc 
+            (use fully-qualified class names).
+            You must also set <a href="#maven.javadoc.tagletpath">
+            maven.javadoc.tagletpath</a>.
+            See <a href="http://ant.apache.org/manual/CoreTasks/javadoc.html">the 
+            ant javadoc task</a> documentation for more detail.
+          </td>
+        </tr>
+        <tr>
+          <td><a name="maven.javadoc.tagletpath">maven.javadoc.tagletpath</a></td>
+          <td>Yes</td>
+          <td>
+            Specifies the path to the taglet classes when calling javadoc 
+            with taglets. See
+            <a href="http://ant.apache.org/manual/CoreTasks/javadoc.html">the 
+            ant javadoc task</a> documentation for more detail.
+          </td>
+        </tr>
         <tr>
           <td>maven.javadoc.use</td>
           <td>Yes</td>
