diff --git a/cactus/plugin.jelly b/cactus/plugin.jelly
index cb3fde64..814619ce 100644
--- a/cactus/plugin.jelly
+++ b/cactus/plugin.jelly
@@ -242,27 +242,43 @@
         <ant:path refid="cactus.classpath"/>
       </ant:classpath>
       <containerset>
+
         <!-- TODO: Find how to set the port for JBoss 3x -->
         <jboss3x if="cactus.home.jboss3x"
             dir="${cactus.home.jboss3x}"
             output="${cactus.reports.dir}/jboss3x.out"
             todir="${cactus.reports.dir}/jboss3x"
-            config="${cactus.jboss3x.config.name}"/>
+            config="${cactus.jboss3x.config.name}">
+          <j:if test="${context.getVariable('cactus.tmp.dir') != null}">
+            <ant:setProperty name="tmpdir" value="${cactus.tmp.dir}"/>
+          </j:if>    
+        </jboss3x>
 
         <orion1x if="cactus.home.orion1x"
             dir="${cactus.home.orion1x}" port="${cactus.port}"
             output="${cactus.reports.dir}/orion1x.out"
-            todir="${cactus.reports.dir}/orion1x"/>
+            todir="${cactus.reports.dir}/orion1x">
+          <j:if test="${context.getVariable('cactus.tmp.dir') != null}">
+            <ant:setProperty name="tmpdir" value="${cactus.tmp.dir}"/>
+          </j:if>    
+        </orion1x>
 
         <orion2x if="cactus.home.orion2x"
             dir="${cactus.home.orion2x}" port="${cactus.port}"
             output="${cactus.reports.dir}/orion2x.out"
-            todir="${cactus.reports.dir}/orion2x"/>
+            todir="${cactus.reports.dir}/orion2x">
+          <j:if test="${context.getVariable('cactus.tmp.dir') != null}">
+            <ant:setProperty name="tmpdir" value="${cactus.tmp.dir}"/>
+          </j:if>    
+        </orion2x>
 
         <resin2x if="cactus.home.resin2x"
             dir="${cactus.home.resin2x}" port="${cactus.port}"
             output="${cactus.reports.dir}/resin2x.out"
             todir="${cactus.reports.dir}/resin2x">
+          <j:if test="${context.getVariable('cactus.tmp.dir') != null}">
+            <ant:setProperty name="tmpdir" value="${cactus.tmp.dir}"/>
+          </j:if>    
           <j:if test="${context.getVariable('cactus.resin2x.config') != null}">
             <ant:setProperty name="resinconf" value="${cactus.resin2x.config}"/>
           </j:if>        
@@ -272,6 +288,9 @@
             dir="${cactus.home.tomcat4x}" port="${cactus.port}"
             output="${cactus.reports.dir}/tomcat4x.out"
             todir="${cactus.reports.dir}/tomcat4x">
+          <j:if test="${context.getVariable('cactus.tmp.dir') != null}">
+            <ant:setProperty name="tmpdir" value="${cactus.tmp.dir}"/>
+          </j:if>    
           <j:if test="${context.getVariable('cactus.tomcat4x.config') != null}">
             <ant:setProperty name="serverxml" value="${cactus.tomcat4x.config}"/>
           </j:if>    
@@ -289,6 +308,9 @@
             dir="${cactus.home.tomcat5x}" port="${cactus.port}"
             output="${cactus.reports.dir}/tomcat5x.out"
             todir="${cactus.reports.dir}/tomcat5x">
+          <j:if test="${context.getVariable('cactus.tmp.dir') != null}">
+            <ant:setProperty name="tmpdir" value="${cactus.tmp.dir}"/>
+          </j:if>    
           <j:if test="${context.getVariable('cactus.tomcat5x.config') != null}">
             <ant:setProperty name="serverxml" value="${cactus.tomcat5x.config}"/>
           </j:if> 
@@ -306,6 +328,9 @@
             dir="${cactus.home.weblogic7x}" port="${cactus.port}"
             output="${cactus.reports.dir}/weblogic7x.out"
             todir="${cactus.reports.dir}/weblogic7x">
+          <j:if test="${context.getVariable('cactus.tmp.dir') != null}">
+            <ant:setProperty name="tmpdir" value="${cactus.tmp.dir}"/>
+          </j:if>    
           <j:if test="${context.getVariable('cactus.weblogic7x.beahome') != null}">
             <ant:setProperty name="beahome" value="${cactus.weblogic7x.beahome}"/>
           </j:if> 
@@ -325,7 +350,7 @@
     	 for several containers -->
     	
     <!-- Consolidate the reports into a single -->
-    <ant:junitreport todir="${maven.build.dir}"
+    <ant:junitreport todir="${cactus.reports.dir}"
         tofile="TESTS-TestSuites-Cactus.xml">
 
       <j:if test="${context.getVariable('cactus.home.jboss3x') != null}">
@@ -411,27 +436,43 @@
         <ant:path refid="cactus.classpath"/>
       </ant:classpath>
       <containerset>
+
         <!-- TODO: Find how to set the port for JBoss 3x -->
         <jboss3x if="cactus.home.jboss3x"
             dir="${cactus.home.jboss3x}"
             output="${cactus.reports.dir}/jboss3x.out"
             todir="${cactus.reports.dir}/jboss3x"
-            config="${cactus.jboss3x.config.name}"/>
+            config="${cactus.jboss3x.config.name}">
+          <j:if test="${context.getVariable('cactus.tmp.dir') != null}">
+            <ant:setProperty name="tmpdir" value="${cactus.tmp.dir}"/>
+          </j:if>    
+        </jboss3x>
 
         <orion1x if="cactus.home.orion1x"
             dir="${cactus.home.orion1x}" port="${cactus.port}"
             output="${cactus.reports.dir}/orion1x.out"
-            todir="${cactus.reports.dir}/orion1x"/>
+            todir="${cactus.reports.dir}/orion1x">
+          <j:if test="${context.getVariable('cactus.tmp.dir') != null}">
+            <ant:setProperty name="tmpdir" value="${cactus.tmp.dir}"/>
+          </j:if>    
+        </orion1x>
 
         <orion2x if="cactus.home.orion2x"
             dir="${cactus.home.orion2x}" port="${cactus.port}"
             output="${cactus.reports.dir}/orion2x.out"
-            todir="${cactus.reports.dir}/orion2x"/>
+            todir="${cactus.reports.dir}/orion2x">
+          <j:if test="${context.getVariable('cactus.tmp.dir') != null}">
+            <ant:setProperty name="tmpdir" value="${cactus.tmp.dir}"/>
+          </j:if>    
+        </orion2x>
 
         <resin2x if="cactus.home.resin2x"
             dir="${cactus.home.resin2x}" port="${cactus.port}"
             output="${cactus.reports.dir}/resin2x.out"
             todir="${cactus.reports.dir}/resin2x">
+          <j:if test="${context.getVariable('cactus.tmp.dir') != null}">
+            <ant:setProperty name="tmpdir" value="${cactus.tmp.dir}"/>
+          </j:if>    
           <j:if test="${context.getVariable('cactus.resin2x.config') != null}">
             <ant:setProperty name="resinconf" value="${cactus.resin2x.config}"/>
           </j:if>        
@@ -441,6 +482,9 @@
             dir="${cactus.home.tomcat4x}" port="${cactus.port}"
             output="${cactus.reports.dir}/tomcat4x.out"
             todir="${cactus.reports.dir}/tomcat4x">
+          <j:if test="${context.getVariable('cactus.tmp.dir') != null}">
+            <ant:setProperty name="tmpdir" value="${cactus.tmp.dir}"/>
+          </j:if>    
           <j:if test="${context.getVariable('cactus.tomcat4x.config') != null}">
             <ant:setProperty name="serverxml" value="${cactus.tomcat4x.config}"/>
           </j:if>    
@@ -458,6 +502,9 @@
             dir="${cactus.home.tomcat5x}" port="${cactus.port}"
             output="${cactus.reports.dir}/tomcat5x.out"
             todir="${cactus.reports.dir}/tomcat5x">
+          <j:if test="${context.getVariable('cactus.tmp.dir') != null}">
+            <ant:setProperty name="tmpdir" value="${cactus.tmp.dir}"/>
+          </j:if>    
           <j:if test="${context.getVariable('cactus.tomcat5x.config') != null}">
             <ant:setProperty name="serverxml" value="${cactus.tomcat5x.config}"/>
           </j:if> 
@@ -475,6 +522,9 @@
             dir="${cactus.home.weblogic7x}" port="${cactus.port}"
             output="${cactus.reports.dir}/weblogic7x.out"
             todir="${cactus.reports.dir}/weblogic7x">
+          <j:if test="${context.getVariable('cactus.tmp.dir') != null}">
+            <ant:setProperty name="tmpdir" value="${cactus.tmp.dir}"/>
+          </j:if>    
           <j:if test="${context.getVariable('cactus.weblogic7x.beahome') != null}">
             <ant:setProperty name="beahome" value="${cactus.weblogic7x.beahome}"/>
           </j:if> 
@@ -520,27 +570,43 @@
         <ant:path refid="cactus.classpath"/>
       </ant:classpath>
       <containerset>
+
         <!-- TODO: Find how to set the port for JBoss 3x -->
         <jboss3x if="cactus.home.jboss3x"
             dir="${cactus.home.jboss3x}"
             output="${cactus.reports.dir}/jboss3x.out"
             todir="${cactus.reports.dir}/jboss3x"
-            config="${cactus.jboss3x.config.name}"/>
+            config="${cactus.jboss3x.config.name}">
+          <j:if test="${context.getVariable('cactus.tmp.dir') != null}">
+            <ant:setProperty name="tmpdir" value="${cactus.tmp.dir}"/>
+          </j:if>    
+        </jboss3x>
 
         <orion1x if="cactus.home.orion1x"
             dir="${cactus.home.orion1x}" port="${cactus.port}"
             output="${cactus.reports.dir}/orion1x.out"
-            todir="${cactus.reports.dir}/orion1x"/>
+            todir="${cactus.reports.dir}/orion1x">
+          <j:if test="${context.getVariable('cactus.tmp.dir') != null}">
+            <ant:setProperty name="tmpdir" value="${cactus.tmp.dir}"/>
+          </j:if>    
+        </orion1x>
 
         <orion2x if="cactus.home.orion2x"
             dir="${cactus.home.orion2x}" port="${cactus.port}"
             output="${cactus.reports.dir}/orion2x.out"
-            todir="${cactus.reports.dir}/orion2x"/>
+            todir="${cactus.reports.dir}/orion2x">
+          <j:if test="${context.getVariable('cactus.tmp.dir') != null}">
+            <ant:setProperty name="tmpdir" value="${cactus.tmp.dir}"/>
+          </j:if>    
+        </orion2x>
 
         <resin2x if="cactus.home.resin2x"
             dir="${cactus.home.resin2x}" port="${cactus.port}"
             output="${cactus.reports.dir}/resin2x.out"
             todir="${cactus.reports.dir}/resin2x">
+          <j:if test="${context.getVariable('cactus.tmp.dir') != null}">
+            <ant:setProperty name="tmpdir" value="${cactus.tmp.dir}"/>
+          </j:if>    
           <j:if test="${context.getVariable('cactus.resin2x.config') != null}">
             <ant:setProperty name="resinconf" value="${cactus.resin2x.config}"/>
           </j:if>        
@@ -550,6 +616,9 @@
             dir="${cactus.home.tomcat4x}" port="${cactus.port}"
             output="${cactus.reports.dir}/tomcat4x.out"
             todir="${cactus.reports.dir}/tomcat4x">
+          <j:if test="${context.getVariable('cactus.tmp.dir') != null}">
+            <ant:setProperty name="tmpdir" value="${cactus.tmp.dir}"/>
+          </j:if>    
           <j:if test="${context.getVariable('cactus.tomcat4x.config') != null}">
             <ant:setProperty name="serverxml" value="${cactus.tomcat4x.config}"/>
           </j:if>    
@@ -567,6 +636,9 @@
             dir="${cactus.home.tomcat5x}" port="${cactus.port}"
             output="${cactus.reports.dir}/tomcat5x.out"
             todir="${cactus.reports.dir}/tomcat5x">
+          <j:if test="${context.getVariable('cactus.tmp.dir') != null}">
+            <ant:setProperty name="tmpdir" value="${cactus.tmp.dir}"/>
+          </j:if>    
           <j:if test="${context.getVariable('cactus.tomcat5x.config') != null}">
             <ant:setProperty name="serverxml" value="${cactus.tomcat5x.config}"/>
           </j:if> 
@@ -584,6 +656,9 @@
             dir="${cactus.home.weblogic7x}" port="${cactus.port}"
             output="${cactus.reports.dir}/weblogic7x.out"
             todir="${cactus.reports.dir}/weblogic7x">
+          <j:if test="${context.getVariable('cactus.tmp.dir') != null}">
+            <ant:setProperty name="tmpdir" value="${cactus.tmp.dir}"/>
+          </j:if>    
           <j:if test="${context.getVariable('cactus.weblogic7x.beahome') != null}">
             <ant:setProperty name="beahome" value="${cactus.weblogic7x.beahome}"/>
           </j:if> 
@@ -635,7 +710,7 @@
     description="Generate a report from the test results">
 
     <doc:jsl
-      input="${maven.build.dir}/TESTS-TestSuites-Cactus.xml"
+      input="${cactus.reports.dir}/TESTS-TestSuites-Cactus.xml"
       output="cactus-report.xml"
       stylesheet="${plugin.resources}/cactus.jsl"
       outputMode="xml"
diff --git a/cactus/plugin.properties b/cactus/plugin.properties
index bdbf9323..4c8f5076 100644
--- a/cactus/plugin.properties
+++ b/cactus/plugin.properties
@@ -48,6 +48,9 @@ cactus.halt.on.error = true
 # "printsummary" attribute of the JUnit Ant task.
 maven.cactus.printsummary = withOutAndErr 
 
+# (optional) Temporary directory where the containers are setup/executed
+#cactus.tmp.dir = 
+
 # -------------------------------------------------------------------
 # Container-related properties
 # -------------------------------------------------------------------
diff --git a/cactus/xdocs/changes.xml b/cactus/xdocs/changes.xml
index 7042ad67..f51356ce 100644
--- a/cactus/xdocs/changes.xml
+++ b/cactus/xdocs/changes.xml
@@ -8,6 +8,19 @@
   <body>
 
     <release version="3.1" date="in CVS">
+      <action dev="vmassol" type="add">
+        Added new <code>cactus.tmp.dir</code> optional property to specify
+        a location where Cactus will put its temporary files (mostly where
+        it setup containers for execution). Defaults to
+        <code>[java.io.tmpdir]/[containername]</code>.
+      </action>
+      <action dev="vmassol" type="update">
+        Generate the Cactus test reports in the Cactus reports directory
+        instead of directly in the Maven build directory. This fixes bug
+        <a href="http://jira.codehaus.org/secure/ViewIssue.jspa?key=MAVEN-669">MAVEN-669</a>
+        and 
+        <a href="http://jira.codehaus.org/secure/ViewIssue.jspa?key=MAVEN-671">MAVEN-671</a>.
+      </action>
       <action dev="vmassol" type="update">
         Updated commons-httpclient dependency to 2.0 rc1, httpunit to
         1.5.3 and nekohtml to 0.7.7.
diff --git a/cactus/xdocs/properties.xml b/cactus/xdocs/properties.xml
index 696c595f..2d80ff37 100644
--- a/cactus/xdocs/properties.xml
+++ b/cactus/xdocs/properties.xml
@@ -135,6 +135,17 @@
             </p>
           </td>
         </tr>
+        <tr>
+          <td>maven.tmpdir.dir</td>
+          <td>Yes</td>
+          <td>
+            <p>
+              Location where Cactus will put its temporary files (mostly where
+              it setups containers for execution). Default value is
+              <code>[java.io.tmpdir]/[containername]</code>.
+            </p>
+          </td>
+        </tr>
 <!--
         <tr>
           <td>cactus.runner</td>