diff --git a/javadoc/plugin.jelly b/javadoc/plugin.jelly
index 04201e0c..c4c51ac9 100644
--- a/javadoc/plugin.jelly
+++ b/javadoc/plugin.jelly
@@ -82,7 +82,6 @@
       <ant:record name="${maven.build.dir}/javadoc/report.txt" action="start" />
 
       <ant:javadoc
-        sourcepathref="maven.compile.src.set"
         packagenames="${pom.package}.*"
         destdir="${maven.javadoc.destdir}"
         author="${maven.javadoc.author}"
@@ -96,6 +95,23 @@
         bottom="${copyright}"
         stylesheetfile="${maven.javadoc.stylesheet}"
         additionalparam="${maven.javadoc.additionalparam}">
+
+        <ant:fileset dir="${pom.build.sourceDirectory}">
+          <ant:include name="**/*.java"/>
+          <!-- FIXME: This is a bad cut and paste -->
+          <!-- handle source modifications -->
+          <j:forEach var="sm" items="${pom.build.sourceModifications}">
+            <ant:available property="classPresent" classname="${sm.className}"/>
+            <j:if test="${classPresent != 'true'}">
+              <j:forEach var="exclude" items="${sm.excludes}">
+                <ant:exclude name="${exclude}"/>
+              </j:forEach>
+              <j:forEach var="include" items="${sm.includes}">
+                <ant:include name="${include}"/>
+              </j:forEach>
+            </j:if>
+          </j:forEach>
+        </ant:fileset> 
         
         <j:if test="${context.getVariable('maven.javadoc.source') != null}">
           <ant:setProperty name="source" value="${maven.javadoc.source}" />
diff --git a/pmd/plugin.jelly b/pmd/plugin.jelly
index 7422bdfe..75ec0c06 100644
--- a/pmd/plugin.jelly
+++ b/pmd/plugin.jelly
@@ -84,6 +84,19 @@
       <formatter type="xml" toFile="${maven.build.dir}/pmd-raw-report.xml"/>
       <fileset dir="${pom.build.sourceDirectory}">
         <include name="**/*.java"/>
+        <!-- FIXME: This is a bad cut and paste -->
+        <!-- handle source modifications -->
+        <j:forEach var="sm" items="${pom.build.sourceModifications}">
+          <available property="classPresent" classname="${sm.className}"/>
+          <j:if test="${classPresent != 'true'}">
+            <j:forEach var="exclude" items="${sm.excludes}">
+              <exclude name="${exclude}"/>
+            </j:forEach>
+            <j:forEach var="include" items="${sm.includes}">
+              <include name="${include}"/>
+            </j:forEach>
+          </j:if>
+        </j:forEach>
       </fileset>
     </pmd>