diff --git a/javadoc/plugin.jelly b/javadoc/plugin.jelly
index 81f9c24c..c79301cd 100644
--- a/javadoc/plugin.jelly
+++ b/javadoc/plugin.jelly
@@ -122,6 +122,21 @@
         <j:if test="${context.getVariable('maven.javadoc.docletpath') != null}">
           <setProperty name="doclet" value="${maven.javadoc.docletpath}" />
         </j:if>
+        
+        <!-- allow custom tags -->    
+        <util:tokenize var="listOfTags" delim=" ">${maven.javadoc.customtags}</util:tokenize>
+        <j:forEach var="someTag" items="${listOfTags}">
+          <j:set var="nameVar" value="${someTag}.name"/>
+          <j:set var="name" value="${context.findVariable(nameVar)}"/>
+          <j:set var="descriptionVar" value="${someTag}.description"/>
+          <j:set var="description" value="${context.findVariable(descriptionVar)}"/>
+          <j:set var="enabledVar" value="${someTag}.enabled"/>
+          <j:set var="enabled" value="${context.findVariable(enabledVar)}"/>
+          <j:set var="scopeVar" value="${someTag}.scope"/>
+          <j:set var="scope" value="${context.findVariable(scopeVar)}"/>
+          <tag name="${name}" description="${description}"
+               enabled="${enabled}" scope="${scope}"/>
+        </j:forEach>
 
       </javadoc>
       <record name="${maven.build.dir}/javadoc/report.txt" action="stop" />