diff --git a/aspectj/plugin.jelly b/aspectj/plugin.jelly
index 4c72906c..098dd396 100644
--- a/aspectj/plugin.jelly
+++ b/aspectj/plugin.jelly
@@ -2,7 +2,7 @@
 
 <!-- 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,6 +58,10 @@
           source="${maven.aspectj.source}"
           time="${maven.aspectj.time}">
 
+        <j:if test="${context.getVariable('maven.aspectj.messageHolder') != null}">
+          <ant:setProperty name="messageHolderClass" value="${maven.aspectj.messageHolder}"/>
+        </j:if>
+
         <j:if test="${context.getVariable('maven.aspectj.fork') == true}">
           <j:if test="${context.getVariable('maven.aspectj.maxmem') != null}">
             <ant:setProperty name="maxmem" value="${maven.aspectj.maxmem}" />
@@ -141,6 +145,7 @@
     <ant:taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties">
       <ant:classpath>
         <ant:pathelement path="${plugin.getDependencyPath('aspectj:aspectjtools')}"/>
+        <ant:path refid="maven.dependency.classpath"/>
       </ant:classpath>
     </ant:taskdef>
 
diff --git a/aspectj/xdocs/changes.xml b/aspectj/xdocs/changes.xml
index 8c8ebb2d..f9482aab 100644
--- a/aspectj/xdocs/changes.xml
+++ b/aspectj/xdocs/changes.xml
@@ -28,6 +28,12 @@
   </properties>
   <body>
     <release version="3.3-SNAPSHOT" date="in CVS">
+      <action dev="vmassol" type="update" issue="MPASPECTJ-19">
+        Add support for <code>iajc</code>'s <code>messageHolderClass</code> attribute
+        and added <code>maven.dependency.classpath</code> to the 
+        <code>iajc</code>'s taskdef so that custom message holder classes will be
+        found at execution time.
+      </action>
       <action dev="carlos" type="update">Now using AspectJ 1.2.1 release.</action>
     </release>
     <release version="3.2" date="2004-10-06">
diff --git a/aspectj/xdocs/properties.xml b/aspectj/xdocs/properties.xml
index 8edf7b53..a50400fd 100644
--- a/aspectj/xdocs/properties.xml
+++ b/aspectj/xdocs/properties.xml
@@ -166,6 +166,16 @@
             Defaults to <code>warning</code>.
           </td>
         </tr>
+
+        <tr>
+          <td>maven.aspectj.messageHolder</td>
+          <td>Yes</td>
+          <td>
+            Specify a class to use as the message holder for the compile process. The entry must be 
+            a fully-qualified name of a class complying with the <code>org.aspectj.bridge.IMessageHolder</code>
+            interface and having a public no-argument constructor.
+          </td>
+        </tr>
         
       </table>
     </section>
