diff --git a/clover/plugin.jelly b/clover/plugin.jelly
index be9bdac4..007f8dab 100644
--- a/clover/plugin.jelly
+++ b/clover/plugin.jelly
@@ -158,12 +158,8 @@
     <echo>Now using primary build.compiler : ${build.compiler}</echo>
 
     <j:set var="tmp" value="${maven.clover.build.classes}"/>
-    <j:set var="mavenBuildDestJavaOld"
-      value="${pom.getPluginContext('maven-java-plugin').getVariable('maven.build.dest')}"/>
-    ${pom.getPluginContext('maven-java-plugin').setVariable('maven.build.dest',tmp)}
-    <j:set var="mavenBuildDestTestOld"
-      value="${pom.getPluginContext('maven-test-plugin').getVariable('maven.build.dest')}"/>
-    ${pom.getPluginContext('maven-test-plugin').setVariable('maven.build.dest',tmp)}
+    <j:set var="mavenBuildDestOld" value="${context.parent.getVariable('maven.build.dest')}"/>
+    ${context.getParent().setVariable('maven.build.dest',tmp)}
 	
   </goal>
 
@@ -175,10 +171,8 @@
   -->
   <goal name="clover:off">
 
-    ${pom.getPluginContext('maven-test-plugin').setVariable('maven.build.dest',mavenBuildDestTestOld)}
-    ${pom.getPluginContext('maven-java-plugin').setVariable('maven.build.dest',mavenBuildDestJavaOld)}
-
-    ${pom.getContext().removeVariable('build.compiler')}
+    ${context.getParent().setVariable('maven.build.dest',mavenBuildDestTestOld)}
+    ${context.removeVariable('build.compiler')}
     
     <j:set var="maven.test.failure.ignore" scope="parent" value="${ignoreTestFailureOld}"/>
     <j:set var="maven.junit.fork" scope="parent" value="${junitForkOld}"/>
diff --git a/clover/xdocs/changes.xml b/clover/xdocs/changes.xml
index c7251d24..81e18d12 100644
--- a/clover/xdocs/changes.xml
+++ b/clover/xdocs/changes.xml
@@ -26,6 +26,11 @@
   </properties>
   <body>
     <release version="1.6-SNAPSHOT" date="in CVS">
+      <action dev="vmassol" type="fix">
+        When executing <code>clover:on</code> and <code>clover:off</code>, modify 
+        the <code>maven.build.dest</code> property value in the Root context of
+        all plugins so that the value change is available in all Maven plugins.
+      </action>
       <action dev="vmassol" type="fix">
         Prevented the <code>clover:on</code> goal from failing when there are 
         no unit tests sources available.
