diff --git a/clover/plugin.jelly b/clover/plugin.jelly
index 5e9ae995..e0cf1819 100644
--- a/clover/plugin.jelly
+++ b/clover/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.
@@ -44,7 +44,7 @@
           <ant:pathelement path="${maven.clover.jar}"/>
         </j:when>
         <j:otherwise>
-          <ant:pathelement path="${plugin.getDependencyPath('clover:clover-ant')}"/>
+          <ant:pathelement path="${plugin.getDependencyPath('clover:clover')}"/>
         </j:otherwise>
       </j:choose>
     </ant:path>
@@ -52,8 +52,17 @@
     <ant:taskdef resource="clovertasks"/>
     <ant:typedef resource="clovertypes"/>
 
-    <j:set var="cloverDatabase" 
-        value="${maven.clover.database.dir}/clover_coverage.db"/>
+    <!-- Check for the deprecated maven.clover.database.dir property -->
+    <j:choose>
+      <j:when test="${context.getVariable('maven.clover.database.dir') != null}">
+        <ant:echo>Usage of the maven.clover.database.dir property is deprecated. Use the maven.clover.database property instead.</ant:echo>
+        <j:set var="maven.clover.database" 
+            value="${maven.clover.database.dir}/clover_coverage.db"/>
+      </j:when>
+      <j:otherwise>
+        <ant:dirname property="maven.clover.database.dir" file="${maven.clover.database}"/>
+      </j:otherwise>
+    </j:choose>
 
     <j:set var="cloverReportDirectory" value="${maven.docs.dest}/clover"/>
 
@@ -61,8 +70,8 @@
     <maven:addPath id="maven.dependency.classpath" refid="clover.classpath"/>
 
     <ant:mkdir dir="${maven.clover.build.classes}"/>
-    <ant:mkdir dir="${maven.clover.database.dir}"/>
     <ant:mkdir dir="${cloverReportDirectory}"/>
+    <ant:mkdir dir="${maven.clover.database.dir}"/>
 
     <!-- Add the Clover license to the classpath. -->
     <j:if test="${!empty(context.getVariable('maven.clover.license.path'))}">
@@ -126,7 +135,7 @@
     <u:tokenize var="srcDirs" delim="||||">${compileSrcSetString}</u:tokenize>
 
     <ant:clover-setup 
-        initstring="${cloverDatabase}"
+        initstring="${maven.clover.database}"
         flushpolicy="interval"
         flushinterval="500">
 
@@ -160,7 +169,7 @@
          Clovered classes by mistake. -->
     <j:set var="mavenBuildDestOld" value="${context.parent.getVariable('maven.build.dest')}"/>
     <j:set var="maven.build.dest" value="${maven.clover.build.classes}" scope="parent" />
-	
+
   </goal>
 
   <!--
@@ -171,7 +180,7 @@
   -->
   <goal name="clover:off" description="Deactivates Clover">
 
-    <j:set var="maven.build.dest" value="${mavenBuildDestTestOld}" scope="parent" />
+    <j:set var="maven.build.dest" value="${mavenBuildDestOld}" scope="parent" />
     ${context.removeVariable('build.compiler')}
 
     <j:if test="${ignoreTestFailureOld != null}">
@@ -240,7 +249,7 @@
       description="Generates the Clover reports">
 
     <!-- Skip reports if no coverage database has been created. -->
-    <u:file var="cloverDatabaseAsFile" name="${cloverDatabase}"/>
+    <u:file var="cloverDatabaseAsFile" name="${maven.clover.database}"/>
     <j:choose>
       <j:when test="${cloverDatabaseAsFile.exists()}">       
 
diff --git a/clover/plugin.properties b/clover/plugin.properties
index 9de518c6..8e44bd13 100644
--- a/clover/plugin.properties
+++ b/clover/plugin.properties
@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------
-# 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.
@@ -24,9 +24,9 @@ maven.clover.build = ${maven.build.dir}/clover
 # Location where clovered classes will be generated
 maven.clover.build.classes = ${maven.clover.build}/classes
 
-# Location of the Clover database (i.e directory where coverage data
+# Location of the Clover database (i.e file into which coverage data
 # will be generated).
-maven.clover.database.dir = ${maven.clover.build}/database
+maven.clover.database = ${maven.clover.build}/database/clover_coverage.db
 
 # Default ordering for the generated Clover reports.
 maven.clover.orderBy = PcCoveredAsc
@@ -44,7 +44,7 @@ maven.clover.instrument.tests = false
 # open source projects. Set it to an empty value if you wish to use Clover's
 # other license loading mechanisms (Clover looks next to clover.jar on the 
 # filesystem and in the classpath).
-maven.clover.license.path = ${plugin.getDependencyPath('clover:clover-30day-eval')}
+maven.clover.license.path = ${plugin.getDependencyPath('clover:clover-license')}
 
 # What are the reports that should be generated
 maven.clover.report.html=true
diff --git a/clover/project.xml b/clover/project.xml
index 0b8a3a22..23a3a4af 100644
--- a/clover/project.xml
+++ b/clover/project.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+
+<!--
 /*
- * 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.
@@ -16,6 +17,7 @@
  * limitations under the License.
  */
  -->
+
 <project>
   <extend>../plugin-parent/project.xml</extend>
   <pomVersion>3</pomVersion>
@@ -60,8 +62,8 @@
     <developer>
       <name>Vincent Massol</name>
       <id>vmassol</id>
-      <email>vmassol@pivolis.com</email>
-      <organization>Pivolis</organization>
+      <email>vmassol@apache.org</email>
+      <organization>Apache Software Foundation</organization>
       <roles>
         <role>Creator</role>
         <role>Java Developer</role>
@@ -107,16 +109,19 @@
   <dependencies>
     <dependency>
       <groupId>clover</groupId>
-      <artifactId>clover-ant</artifactId>
-      <version>1.3_01</version>
+      <artifactId>clover</artifactId>
+      <version>1.3.4</version>
       <properties>
         <classloader>root</classloader>
       </properties>
     </dependency>
+    <!-- Note: We name the license artifact clover-license even though the type
+         tells it's a license because artifacts must have unique name
+         (groupId:artifactId) -->
     <dependency>
       <groupId>clover</groupId>
-      <artifactId>clover-30day-eval</artifactId>
-      <version>1.0</version>
+      <artifactId>clover-license</artifactId>
+      <version>20060130</version>
       <type>license</type>
     </dependency>
   </dependencies>
diff --git a/clover/xdocs/changes.xml b/clover/xdocs/changes.xml
index 4f12e7ad..47d49085 100644
--- a/clover/xdocs/changes.xml
+++ b/clover/xdocs/changes.xml
@@ -25,7 +25,23 @@
     <author email="evenisse@ifrance.com">Emmanuel Venisse</author>
   </properties>
   <body>
-    <release version="1.7-SNAPSHOT" date="in CVS">
+    <release version="1.7-SNAPSHOT" date="in SVN">
+      <action dev="vmassol" type="update" issue="MPCLOVER-24">
+        Deprecated <code>maven.clover.database.dir</code> property and
+        replaced it with a <code>maven.cover.database</code> property that
+        contains not only the database directory but also the name of the
+        database file.
+      </action>
+      <action dev="vmassol" type="fix" issue="MPCLOVER-28">
+        <code>clover:off</clover> should now reset correctly the 
+        <code>maven.build.dest</code> property that <code>clover:on</code>
+        modifies. Note that the reported error has been fixed even though I
+        have not been able to reproduce the problem (and hence we don't have
+        a test for it).
+      </action>
+      <action dev="vmassol" type="update" issue="MPCLOVER-26">
+        Upgraded Clover to version 1.3.4.
+      </action>
     </release>
     <release version="1.6" date="2004-09-30">
       <action dev="vmassol" type="fix" issue="MPCLOVER-23">
@@ -44,8 +60,8 @@
         <code>clover:test-single</code>.
       </action>
       <action dev="vmassol" type="add" issue="MPCLOVER-9">
-        Added new <code>clover:test-single</code> goal to execute a single test 
-        case and to view the test coverage result directly using the Clover 
+        Added new <code>clover:test-single</code> goal to execute a single test
+        case and to view the test coverage result directly using the Clover
         Swing viewer. This is useful if you wish to quickly see the action that
         a single unit test has on the code it tests.
       </action>
@@ -53,16 +69,16 @@
         Now using <code>maven:get</code> and <code>maven:set</code>.
       </action>
       <action dev="vmassol" type="update">
-        The <code>clover:report</code> goal does not call the tests anymore. 
+        The <code>clover:report</code> goal does not call the tests anymore.
         It only generates Clover reports.
       </action>
       <action dev="vmassol" type="fix">
-        When executing <code>clover:on</code> and <code>clover:off</code>, modify 
+        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 
+        Prevented the <code>clover:on</code> goal from failing when there are
         no unit tests sources available.
       </action>
       <action dev="vmassol" type="update">
@@ -112,5 +128,5 @@
     <release version="1.0" date="unknown">
       <action dev="vmassol" type="add">These changes did not exist at that time. Please refer to CVS for history changes before version 1.1.</action>
     </release>
-  </body>
+  </body>body>body>
 </document>
diff --git a/clover/xdocs/properties.xml b/clover/xdocs/properties.xml
index 04bb4cff..20411ba3 100644
--- a/clover/xdocs/properties.xml
+++ b/clover/xdocs/properties.xml
@@ -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.
@@ -87,13 +87,13 @@
           </td>
         </tr>
         <tr>
-          <td>maven.clover.database.dir</td>
+          <td>maven.clover.database</td>
           <td>Yes</td>
           <td>
             Specifies the location of the Clover database.
           </td>
           <td>
-            <code>${maven.build.clover}/database</code>
+            <code>${maven.clover.build}/database/clover_coverage.db</code>
           </td>
         </tr>
         <tr>
@@ -120,7 +120,7 @@
             looks next to clover.jar on the filesystem and in the classpath).
           </td>
           <td>
-            <code>${plugin.getDependencyPath('clover:clover-30day-eval')}</code>
+            <code>${plugin.getDependencyPath('clover:clover-license')}</code>
           </td>
         </tr>
       </table>