diff --git a/pmd/plugin.jelly b/pmd/plugin.jelly
index 4467e2c8..07d64000 100644
--- a/pmd/plugin.jelly
+++ b/pmd/plugin.jelly
@@ -23,7 +23,7 @@
     PMD Plugin. Generate PMD reports using the PMD framework.
   =============================================================================
 -->
-<project xmlns:j="jelly:core" xmlns:doc="doc">
+<project xmlns:j="jelly:core" xmlns:doc="doc" xmlns:ant="jelly:ant">
 
   <!--
      ========================================================================
@@ -37,7 +37,7 @@
         pluginName="pmd"
         description="Verification of coding rules."
         link="pmd-report"/>
-      <j:if test="${maven.pmd.cpd.enable}">
+      <j:if test="${context.getVariable('maven.pmd.cpd.enable') == 'true'}">
           <doc:registerReport 
             name="CPD Report"
             pluginName=""
@@ -55,7 +55,7 @@
   <goal name="maven-pmd-plugin:deregister">
     <j:if test="${sourcesPresent}">
       <doc:deregisterReport name="PMD Report"/>
-      <j:if test="${maven.pmd.cpd.enable}">
+      <j:if test="${context.getVariable('maven.pmd.cpd.enable') == 'true'}">
         <doc:deregisterReport name="CPD Report"/>
       </j:if>
     </j:if>
@@ -170,6 +170,8 @@
     <!-- Run the CPD task  -->
     <echo>Running the CPD task with minimumTokenCount = ${maven.pmd.cpd.minimumtokencount} ...</echo>
 
+    <ant:mkdir dir="${maven.build.dir}" />
+
     <cpd minimumTokenCount="${maven.pmd.cpd.minimumtokencount}"
       outputFile="${maven.build.dir}/cpd-raw-report.txt">
       <!-- cut and paste from pmd:report -->
@@ -196,6 +198,7 @@
     <!-- Convert raw text report into XDOC -->
 
     <j:set var="genDocs" value="${maven.gen.docs}" />
+    <ant:mkdir dir="${genDocs}" />
     <doc:text-xdoc
       title="CPD Report"
       section="CPD Report"
diff --git a/pmd/xdocs/changes.xml b/pmd/xdocs/changes.xml
index 0fb8835d..8b0204d4 100644
--- a/pmd/xdocs/changes.xml
+++ b/pmd/xdocs/changes.xml
@@ -25,6 +25,10 @@
     <author email="vmassol@apache.org">Vincent Massol</author>
   </properties>
   <body>
+    <release version="1.4-SNAPSHOT" date="in CVS">
+      <action dev="brett" type="fix" issue="MPPMD-7">Create directories that exist under maven.build.dir before using them so it works after clean.</action>
+      <action dev="brett" type="fix">Fix usage of the maven.pmd.cpd.enable property so it is disabled when set to false (the default)</action>
+    </release>
     <release version="1.3" date="2004-03-10">
       <action dev="dion" type="fix" issue="MAVEN-1044">Allow multiple includes/excludes.</action>
       <action dev="dion" type="update">Apply MAVEN-1008. Allow for custom rulesets in the classpath.</action>
