diff --git a/pmd/plugin.jelly b/pmd/plugin.jelly
index ede76498..2630b939 100644
--- a/pmd/plugin.jelly
+++ b/pmd/plugin.jelly
@@ -74,6 +74,11 @@
         
     <!-- Run the PMD task - need a way to define the rulesets dynamically -->
     <echo>Running the PMD task with ${maven.pmd.rulesetfiles} ...</echo>
+
+    <!-- Prepare empty raw report because no file is generated if no rule is 
+         violated and that causes the report generation to fail later on -->
+    <echo file="${maven.build.dir}/pmd-raw-report.xml" 
+        message="&lt;?xml version='1.0'?&gt;&lt;pmd/&gt;"/>
     
     <pmd rulesetfiles="${maven.pmd.rulesetfiles}">
       <formatter type="xml" toFile="${maven.build.dir}/pmd-raw-report.xml"/>
diff --git a/pmd/xdocs/changes.xml b/pmd/xdocs/changes.xml
index cd0fe15b..030c6143 100644
--- a/pmd/xdocs/changes.xml
+++ b/pmd/xdocs/changes.xml
@@ -6,9 +6,14 @@
     <author email="vmassol@apache.org">Vincent Massol</author>
   </properties>
 
-  <releases>
+  <body>
 
     <release version="1.1" date="in CVS">
+      <action dev="vmassol" type="fix">
+        Make sure the report does not fail if PMD does not detect any 
+        violation. Fixes bug
+        <a href="http://jira.codehaus.org/secure/ViewIssue.jspa?key=MAVEN-538">MAVEN-538</a>.
+      </action>            
     </release>
 
     <release version="1.0" date="2003-04-08">
@@ -55,7 +60,7 @@
         Updated to used PMD 1.0
       </action>            
     </release>      
-  </releases>
-  
+
+  </body>  
 </document>
 
