diff --git a/clover/plugin.jelly b/clover/plugin.jelly
index 8acf427a..2fbeae63 100644
--- a/clover/plugin.jelly
+++ b/clover/plugin.jelly
@@ -214,6 +214,11 @@
   -->
   <goal name="clover:off-internal">
 
+    <!-- Disable Clover -->
+    <ant:clover-setup
+        initstring="${maven.clover.database}"
+        enabled="false"/>
+    
     <j:set var="maven.build.dest" value="${mavenBuildDestOld}" scope="parent" />
     ${context.removeVariable('build.compiler')}
 
diff --git a/clover/src/plugin-test/testCloverOffCleansProperly/maven.xml b/clover/src/plugin-test/testCloverOffCleansProperly/maven.xml
new file mode 100644
index 00000000..5c691690
--- /dev/null
+++ b/clover/src/plugin-test/testCloverOffCleansProperly/maven.xml
@@ -0,0 +1,43 @@
+<!-- 
+/*
+ * Copyright 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+<project default="testPlugin"
+  xmlns:util="jelly:util"
+  xmlns:j="jelly:core"
+  xmlns:ant="jelly:ant"
+  xmlns:x="jelly:xml"
+  xmlns:maven="jelly:maven"
+  xmlns:assert="assert">
+
+  <goal name="testPlugin">
+
+    <attainGoal name="clean"/>
+  	<attainGoal name="clover:on"/>
+  	<attainGoal name="jar"/>
+    <attainGoal name="clover:off"/>
+
+  	<ant:delete dir="${maven.build.dest}"/>
+    <ant:record name="${maven.build.dir}/log.txt" action="start"/>
+  	<attainGoal name="jar"/>
+    <ant:record name="${maven.build.dir}/log.txt" action="stop"/>
+
+    <assert:assertFileContains file="${maven.build.dir}/log.txt" 
+        match="Clover is disabled. Delegating straight to the compiler"/>
+  	
+  </goal>
+
+</project>
\ No newline at end of file
diff --git a/clover/src/plugin-test/testCloverOffCleansProperly/project.xml b/clover/src/plugin-test/testCloverOffCleansProperly/project.xml
new file mode 100644
index 00000000..d216aef7
--- /dev/null
+++ b/clover/src/plugin-test/testCloverOffCleansProperly/project.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- 
+/*
+ * Copyright 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+
+<project>
+  <extend>${basedir}/../project.xml</extend>
+  <id>testCloverOffCleansProperly</id>
+  <name>testCloverOffCleansProperly</name>
+  <build>
+    <sourceDirectory>src/main</sourceDirectory>
+    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+    <unitTest>
+      <includes>
+        <include>**/*Test.java</include>
+      </includes>
+    </unitTest>
+  </build>
+</project>
diff --git a/clover/src/plugin-test/testCloverOffCleansProperly/src/main/org/apache/maven/clover/test/Simple.java b/clover/src/plugin-test/testCloverOffCleansProperly/src/main/org/apache/maven/clover/test/Simple.java
new file mode 100644
index 00000000..b441aa6e
--- /dev/null
+++ b/clover/src/plugin-test/testCloverOffCleansProperly/src/main/org/apache/maven/clover/test/Simple.java
@@ -0,0 +1,25 @@
+package org.apache.maven.clover.test;
+
+/* ====================================================================
+ *   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.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ * ====================================================================
+ */
+
+public class Simple
+{
+    public void someMethod()
+    {        
+    }
+} 
\ No newline at end of file
diff --git a/clover/src/plugin-test/testCloverOffCleansProperly/src/test/org/apache/maven/clover/test/SimpleTest.java b/clover/src/plugin-test/testCloverOffCleansProperly/src/test/org/apache/maven/clover/test/SimpleTest.java
new file mode 100644
index 00000000..d18d53df
--- /dev/null
+++ b/clover/src/plugin-test/testCloverOffCleansProperly/src/test/org/apache/maven/clover/test/SimpleTest.java
@@ -0,0 +1,29 @@
+package org.apache.maven.clover.test;
+
+/* ====================================================================
+ *   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.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ * ====================================================================
+ */
+
+import junit.framework.TestCase;
+
+public class SimpleTest extends TestCase
+{
+    public void testSomeMethod()
+    {        
+        Simple simple = new Simple();
+        simple.someMethod();
+    }
+} 
\ No newline at end of file
diff --git a/clover/xdocs/changes.xml b/clover/xdocs/changes.xml
index f5aa0e3b..7f0cfc9b 100644
--- a/clover/xdocs/changes.xml
+++ b/clover/xdocs/changes.xml
@@ -26,6 +26,10 @@
   </properties>
   <body>
     <release version="1.9-SNAPSHOT" date="in SVN">
+      <action dev="vmassol" type="fix" issue="MPCLOVER-32">
+        Fully disable Clover in <code>clover:off</code> so that the Clover
+        compiler adapter delegates straight to the default compiler.
+      </action>
       <action dev="vmassol" type="remove">
         Removed the <code>maven.clover.jar</code> property that was used to 
         override the default Clover jar. This property was not working