diff --git a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiresDependencyCollectionTypeTaglet.java b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiresDependencyCollectionTypeTaglet.java
new file mode 100644
index 0000000..e2c250f
--- /dev/null
+++ b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiresDependencyCollectionTypeTaglet.java
@@ -0,0 +1,117 @@
+package org.apache.maven.tools.plugin.javadoc;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import com.sun.tools.doclets.Taglet;
+import org.apache.maven.tools.plugin.extractor.java.JavaMojoAnnotation;
+
+import java.util.Map;
+
+/**
+ * The @requiresDependencyCollection tag is used to specify the required dependencies in the specified scope
+ * and has parameter.
+ *
+ * The following is a sample declaration:
+ *
+ * /**
+ * * Dummy Mojo.
+ * *
+ * * @requiresDependencyCollection <requiredScope>
+ * * ...
+ * */
+ * public class MyMojo extends AbstractMojo{}
+ *
+ * To use it, calling the Javadoc tool with the following:
+ *
+ * javadoc ... -taglet 'org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyCollectionTypeTaglet'
+ *
+ * Note: This taglet is similar to call the Javadoc tool with the following:
+ *
+ * javadoc ... -tag 'requiresDependencyCollection:t:Requires the collection of the dependencies in this specified scope:'
+ *
+ *
+ * @see package-summary.html
+ *
+ * @author Kristian Rosenvold
+ * @version $Id$
+ */
+public class MojoRequiresDependencyCollectionTypeTaglet
+ extends AbstractMojoTypeTaglet
+{
+ /** The Javadoc annotation */
+ private static final String NAME = JavaMojoAnnotation.REQUIRES_DEPENDENCY_COLLECTION;
+
+ /** The Javadoc text which will be added to the generated page. */
+ protected static final String HEADER = "Collects the dependencies in this specified scope";
+
+ /**
+ * @return By default, return the string defined in {@linkplain #HEADER}.
+ * @see AbstractMojoTaglet#getHeader()
+ * @see #HEADER
+ */
+ public String getHeader()
+ {
+ return HEADER;
+ }
+
+ /**
+ * @return "*" since @requiresDependencyCollection has value.
+ * @see AbstractMojoTaglet#getAllowedValue()
+ */
+ public String getAllowedValue()
+ {
+ return "*";
+ }
+
+ /**
+ * @return null since @requiresDependencyCollection has no parameter.
+ * @see AbstractMojoTaglet#getAllowedParameterNames()
+ */
+ public String[] getAllowedParameterNames()
+ {
+ return null;
+ }
+
+ /**
+ * @return By default, return the name of this taglet.
+ * @see com.sun.tools.doclets.Taglet#getName()
+ * @see org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyCollectionTypeTaglet#NAME
+ */
+ public String getName()
+ {
+ return NAME;
+ }
+
+ /**
+ * Register this Taglet.
+ *
+ * @param tagletMap the map to register this tag to.
+ */
+ public static void register( Map tagletMap )
+ {
+ MojoRequiresDependencyCollectionTypeTaglet tag = new MojoRequiresDependencyCollectionTypeTaglet();
+ Taglet t = (Taglet) tagletMap.get( tag.getName() );
+ if ( t != null )
+ {
+ tagletMap.remove( tag.getName() );
+ }
+ tagletMap.put( tag.getName(), tag );
+ }
+}
\ No newline at end of file
diff --git a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoThreadSafeTypeTaglet.java b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoThreadSafeTypeTaglet.java
new file mode 100644
index 0000000..2c8bd03
--- /dev/null
+++ b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoThreadSafeTypeTaglet.java
@@ -0,0 +1,116 @@
+package org.apache.maven.tools.plugin.javadoc;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import com.sun.tools.doclets.Taglet;
+import org.apache.maven.tools.plugin.extractor.java.JavaMojoAnnotation;
+
+import java.util.Map;
+
+/**
+ * The @threadSafe tag is used to indicate that a mojo is threadsafe and can be run in parallel
+ *
+ * The following is a sample declaration:
+ *
+ * /**
+ * * Dummy Mojo.
+ * *
+ * * @threadSafe <true|false>
+ * * ...
+ * */
+ * public class MyMojo extends AbstractMojo{}
+ *
+ * To use it, calling the Javadoc tool with the following:
+ *
+ * javadoc ... -taglet 'org.apache.maven.tools.plugin.javadoc.MojoThreadSafeTypeTaglet'
+ *
+ * Note: This taglet is similar to call the Javadoc tool with the following:
+ *
+ * javadoc ... -tag 'threadSafe:t:Indicates the mojo is threadsafe'
+ *
+ *
+ * @see package-summary.html
+ *
+ * @author Kristian Rosenvold
+ * @version $Id$
+ */
+public class MojoThreadSafeTypeTaglet
+ extends AbstractMojoTypeTaglet
+{
+ /** The Javadoc annotation */
+ private static final String NAME = JavaMojoAnnotation.THREADSAFE;
+
+ /** The Javadoc text which will be added to the generated page. */
+ protected static final String HEADER = "Mojo is thread safe";
+
+ /**
+ * @return By default, return the string defined in {@linkplain #HEADER}.
+ * @see AbstractMojoTaglet#getHeader()
+ * @see #HEADER
+ */
+ public String getHeader()
+ {
+ return HEADER;
+ }
+
+ /**
+ * @return true|false since @requiresProject has value.
+ * @see AbstractMojoTaglet#getAllowedValue()
+ */
+ public String getAllowedValue()
+ {
+ return "true|false";
+ }
+
+ /**
+ * @return null since @requiresProject has no parameter.
+ * @see AbstractMojoTaglet#getAllowedParameterNames()
+ */
+ public String[] getAllowedParameterNames()
+ {
+ return null;
+ }
+
+ /**
+ * @return By default, return the name of this taglet.
+ * @see com.sun.tools.doclets.Taglet#getName()
+ * @see MojoThreadSafeTypeTaglet#NAME
+ */
+ public String getName()
+ {
+ return NAME;
+ }
+
+ /**
+ * Register this Taglet.
+ *
+ * @param tagletMap the map to register this tag to.
+ */
+ public static void register( Map tagletMap )
+ {
+ MojoThreadSafeTypeTaglet tag = new MojoThreadSafeTypeTaglet();
+ Taglet t = (Taglet) tagletMap.get( tag.getName() );
+ if ( t != null )
+ {
+ tagletMap.remove( tag.getName() );
+ }
+ tagletMap.put( tag.getName(), tag );
+ }
+}
\ No newline at end of file