diff --git a/javadoc/project.xml b/javadoc/project.xml
index e617a362..08bb0b30 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.1</currentVersion>
+  <currentVersion>1.2-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
   <url>http://maven.apache.org/reference/plugins/javadoc/</url>
diff --git a/javadoc/xdocs/changes.xml b/javadoc/xdocs/changes.xml
index 4255c592..db353ff6 100644
--- a/javadoc/xdocs/changes.xml
+++ b/javadoc/xdocs/changes.xml
@@ -6,7 +6,12 @@
   </properties>
 
   <body>
-    <release version="1.1" date="in CVS">
+    <release version="1.2" date="in CVS">
+      <action dev="evenisse" type="add">
+        Added a custom tags support. This option is only available with Java 1.4.
+      </action>
+    </release>
+    <release version="1.1">
       <action dev="dion" type="add">
         Added a report with the javadoc run contents
       </action>
diff --git a/javadoc/xdocs/properties.xml b/javadoc/xdocs/properties.xml
index 3efea69e..6b59fddf 100644
--- a/javadoc/xdocs/properties.xml
+++ b/javadoc/xdocs/properties.xml
@@ -114,6 +114,30 @@
             from the project descriptor.
           </td>
         </tr>
+        <tr>
+          <td>maven.javadoc.customtags</td>
+          <td>Yes</td>
+          <td>
+            Specifies custom tags to use for the generated
+            Javadocs. You can specify some tags separate by space.
+            Each tag is describe in sub properties. 
+            This option is only available with Java 1.4.
+            Sample :
+            <source><![CDATA[
+maven.javadoc.customtags=tag1 tag2
+tag1.name=todo
+tag1.description=To Do:
+tag1.enabled=true
+tag1.scope=all
+
+tag2.name=task
+tag2.description=Task:
+tag2.enabled=false
+tag2.scope=all
+            ]]>
+            </source>
+          </td>
+        </tr>
       </table>
     </section>
   </body>
