diff --git a/clover/plugin.jelly b/clover/plugin.jelly
index 05544d73..5ca56132 100644
--- a/clover/plugin.jelly
+++ b/clover/plugin.jelly
@@ -85,12 +85,11 @@
     <ant:mkdir dir="${maven.build.clover.classes}"/>
     <ant:mkdir dir="${maven.clover.database.dir}"/>
     <ant:mkdir dir="${cloverReportDirectory}"/>
-    
-    
+
     <j:set var="tmp" value="${maven.build.clover.classes}"/>
     ${pom.getPluginContext('maven-java-plugin').setVariable('maven.build.dest',tmp)}
-    <!--echo>Found maven-test-plugin: ${pom.getPluginContext('maven-test-plugin')}</echo-->
     ${pom.getPluginContext('maven-test-plugin').setVariable('maven.build.dest',tmp)}
+
   </goal>
 
   <!-- =================================================================== -->
@@ -98,14 +97,16 @@
   <!-- =================================================================== -->
 
   <goal name="clover"
-        description="Generate HTML test coverage reports with Clover"
-        prereqs="clover:html-report"/>
+        description="Generate test coverage reports with Clover"
+        prereqs="clover:report"/>
 
   <goal name="clover:test" prereqs="clover:on">
-  	<!-- Make sure that the report is generated whether the tests pass or not -->
+
+    <!-- Make sure that the report is generated whether the tests pass or 
+         not -->
     <j:set var="ignoreTestFailureOld" value="${maven.test.failure.ignore}"/>
     <j:set var="junitForkOld" value="${maven.junit.fork}"/>
-    
+     
     <j:set var="maven.test.failure.ignore" scope="parent" value="true"/>
     <j:set var="maven.junit.fork" scope="parent" value="true"/>
     
@@ -113,13 +114,51 @@
     
     <j:set var="maven.test.failure.ignore" scope="parent" value="${ignoreTestFailureOld}"/>
     <j:set var="maven.junit.fork" scope="parent" value="${junitForkOld}"/>
+
+  </goal>
+
+  <!--
+     ========================================================================
+       Generate test coverage reports. It decides what kind of reports should
+       be generated.
+     ========================================================================
+  -->
+  <goal name="clover:report" prereqs="clover:test">
+    <j:if test="${context.getVariable('maven.clover.report.xml') == 'true'}">
+      <attainGoal name="clover:xml-report-internal"/>
+    </j:if>
+    <j:if test="${context.getVariable('maven.clover.report.html') == 'true'}">
+      <attainGoal name="clover:html-report-internal"/>
+    </j:if>
+    <j:if test="${context.getVariable('maven.clover.report.swing') == 'true'}">
+      <attainGoal name="clover:swing-report-internal"/>
+    </j:if>
+  </goal>
+
+  <!--
+     ========================================================================
+       Generate XML test coverage report.
+     ========================================================================
+  -->
+  <goal name="clover:xml-report-internal">
+	<ant:clover-report>
+      <current outfile="${maven.build.dir}/clover.xml" 
+      	title="${pom.name} - ${pom.currentVersion}">
+        <format type="xml" orderBy="${maven.clover.orderBy}"/>
+      </current>
+    </ant:clover-report>
   </goal>
-  
-  
   <goal 
-    name="clover:html-report" 
-    description="Generate HTML test coverage reports with Clover">
-    <attainGoal name="clover:test"/>
+    name="clover:xml-report" 
+    description="Generate XML test coverage reports with Clover"
+    prereqs="clover:test,clover:xml-report-internal"/>
+
+  <!--
+     ========================================================================
+       Generate HTML test coverage report.
+     ========================================================================
+  -->
+  <goal name="clover:html-report-internal">
 	<ant:clover-report>
       <current 
       	outfile="${cloverReportDirectory}" 
@@ -128,14 +167,18 @@
       </current>
     </ant:clover-report>
   </goal>
+  <goal 
+    name="clover:html-report" 
+    description="Generate HTML test coverage reports with Clover"
+    prereqs="clover:test,clover:html-report-internal"/>
 
-  <goal
-    name="clover:swing-report"
-    prereqs="clover:test"
-    description="Generate Swing test coverage reports with Clover">
-
+  <!--
+     ========================================================================
+       Generate Swing test coverage report.
+     ========================================================================
+  -->
+  <goal name="clover:swing-report-internal">
     <ant:mkdir dir="${cloverReportDirectory}"/>
-
     <ant:java classname="com.cortexeb.tools.clover.reporters.jfc.Viewer"
         fork="yes">
         <ant:arg line="${clover.initstring}"/>
@@ -144,7 +187,10 @@
           <ant:pathelement path="${plugin.getDependencyPath('clover')}"/>
         </ant:classpath>
     </ant:java>
-
   </goal>
+  <goal
+    name="clover:swing-report"
+    description="Generate Swing test coverage reports with Clover"
+    prereqs="clover:test,clover:swing-report-internal"/>
 
 </project>
diff --git a/clover/plugin.properties b/clover/plugin.properties
index a365803c..690a3e3b 100644
--- a/clover/plugin.properties
+++ b/clover/plugin.properties
@@ -8,4 +8,9 @@
 maven.build.clover = ${maven.build.dir}/clover
 maven.build.clover.classes = ${maven.build.clover}/classes
 maven.clover.database.dir = ${maven.build.clover}/database
-maven.clover.orderBy=PcCoveredAsc
\ No newline at end of file
+maven.clover.orderBy=PcCoveredAsc
+
+# What are the reports that should be generated
+maven.clover.report.html=true
+maven.clover.report.xml=false
+maven.clover.report.swing=false
diff --git a/clover/project.xml b/clover/project.xml
index 6e1a8156..9c0b5931 100644
--- a/clover/project.xml
+++ b/clover/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-clover-plugin</id>
   <name>Maven Clover Plug-in</name>
-  <currentVersion>1.2</currentVersion>
+  <currentVersion>1.3-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>Produce Clover reports</shortDescription>
   <url>http://maven.apache.org/reference/plugins/clover/</url>
@@ -20,6 +20,11 @@
       <name>1.2</name>
       <tag>NEVER RELEASED</tag>
     </version>
+    <version>
+      <id>1.3</id>
+      <name>1.3</name>
+      <tag>HEAD</tag>
+    </version>
   </versions>
   <developers>
     <developer>
diff --git a/clover/xdocs/changes.xml b/clover/xdocs/changes.xml
index 6c87218e..e0c19dce 100644
--- a/clover/xdocs/changes.xml
+++ b/clover/xdocs/changes.xml
@@ -7,7 +7,16 @@
   </properties>
 
   <body>
-	<release version="1.2" date="2003-09-29">
+
+	<release version="1.3" date="in CVS">
+      <action dev="vmassol" type="update">
+        Added optional properties to decide what reports to generate. Added
+        a <code>clover:report</code> goal which generates all the defined
+        reports. The default is to generate only the HTML report.
+      </action>
+    </release>
+    
+	<release version="1.2" date="unknown">
 	  <action dev="dion" type="fix">
 	    Apply MAVEN-819. Allows a new property to be used to specify the 
 	    sort order of the HTML clover report.
@@ -22,16 +31,13 @@
       <action dev="bwalding" type="update">
 		Upgrade to Clover 1.2
       </action>
-    </release>
-
-    <release version="1.2" date="in CVS">
       <action dev="vmassol" type="update">
         Make sure that test failures or errors do not stop the generation
         of the Clover reports.
       </action>
     </release>
     
-    <release version="1.1" date="?">
+    <release version="1.1" date="unknown">
       <action dev="vmassol" type="update">
         The Clover plugin now depends on version 1.0 of the Clover jar.
       </action>
@@ -44,6 +50,7 @@
         Creation of this changes page.
       </action>
     </release>
+
     <release version="1.0" date="unknown">
       <action dev="vmassol" type="unknown">
         This changes did not exist at that time. Please refer to CVS for