diff --git a/aspectj/plugin.jelly b/aspectj/plugin.jelly
index 1e512b2d..99a919a7 100644
--- a/aspectj/plugin.jelly
+++ b/aspectj/plugin.jelly
@@ -97,7 +97,6 @@
 
       <ant:iajc
           fork="${maven.aspectj.fork}"
-          maxmem="${maven.aspectj.maxmem}"
           incremental="${maven.aspectj.incremental}"
           destDir="${maven.build.dest}"
           sourceRootCopyFilter="${maven.aspectj.sourceRootCopyFilter}"
@@ -107,6 +106,12 @@
           source="${maven.aspectj.source}"
           time="${maven.aspectj.time}">
 
+        <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}" />
+          </j:if>
+        </j:if>
+
         <ant:sourceroots>
           <ant:path refid="maven.compile.src.set"/>
           <j:if test="${aspectSourcesPresent == 'true'}">
diff --git a/aspectj/xdocs/changes.xml b/aspectj/xdocs/changes.xml
index 51cb12cc..c5fdcc96 100644
--- a/aspectj/xdocs/changes.xml
+++ b/aspectj/xdocs/changes.xml
@@ -28,6 +28,11 @@
   </properties>
   <body>
     <release version="3.1-SNAPSHOT" date="in CVS">
+      <action dev="carlos" type="fix" issue="MPASPECTJ-10">
+        Use <code>maven.aspectj.maxmem</code>
+        only when <code>maven.aspectj.fork=true</code>
+        to avoid aspectj warnings
+      </action>
       <action dev="vmassol" type="update">
         Now using AspectJ 1.2 release.
       </action>
