diff --git a/dist/plugin.jelly b/dist/plugin.jelly
index 24e09b8b..ad3b2e28 100644
--- a/dist/plugin.jelly
+++ b/dist/plugin.jelly
@@ -54,11 +54,7 @@
     </ant:echo>
 
     <ant:copy todir="${maven.dist.bin.assembly.dir}">
-      <ant:fileset dir=".">
-        <ant:include name="README.txt"/>
-        <ant:include name="LICENSE*"/>
-        <ant:include name="NOTICE*"/>
-      </ant:fileset>
+      <ant:fileset dir="." includes="${maven.dist.bin.includes}"/>
     </ant:copy>
 
     <j:set var="binArtifactType" value="${maven.dist.bin.artifact.type}"/>
@@ -141,16 +137,7 @@
     <util:tokenize var="includelist" delim=",">${maven.dist.src.include}</util:tokenize>
 
     <ant:copy todir="${maven.dist.src.assembly.dir}">
-      <ant:fileset dir=".">
-        <ant:include name="README.txt"/>
-        <ant:include name="LICENSE*"/>
-        <ant:include name="NOTICE*"/>
-        <ant:include name="project.properties"/>
-        <ant:include name="maven.xml"/>
-        <j:forEach items="${includelist}" var="includeitem">
-          <ant:include name="${includeitem}" />
-        </j:forEach>
-      </ant:fileset>
+      <ant:fileset dir="." includes="${maven.dist.src.includes}"/>
     </ant:copy>
 
     <!-- We can't use it in the bootstrap phase because classes aren't yet build in the artifact plugin. -->
@@ -486,12 +473,7 @@
     </ant:echo>
 
     <ant:copy todir="${maven.dist.bin.assembly.dir}">
-      <ant:fileset dir=".">
-        <ant:include name="README.txt"/>
-        <ant:include name="LICENSE*"/>
-        <ant:include name="NOTICE*"/>
-        <ant:include name="INCUBATOR-DISCLAIMER.txt"/>
-      </ant:fileset>
+      <ant:fileset dir="." includes="${maven.dist.bin.includes}"/>
     </ant:copy>
 
     <ant:echo>
@@ -538,10 +520,12 @@
           <packageset dir="${project.build.sourceDirectory}"/>
         </j:if>
       </j:forEach>
+      <j:useBean var="classPathBuilder" class="org.apache.maven.DependencyClasspathBuilder"/>
       <classpath>
-        <fileset dir="${basedir}">
-          <include name="**/*.jar"/>
-        </fileset>
+        <path location="${maven.build.dest}"/>
+        <j:forEach var="project" items="${reactorProjects}">
+          <pathelement path="${classPathBuilder.build(project)}"/>
+        </j:forEach>
       </classpath>
     </javadoc>
 
diff --git a/dist/plugin.properties b/dist/plugin.properties
index 35ff25d3..ae348462 100644
--- a/dist/plugin.properties
+++ b/dist/plugin.properties
@@ -31,4 +31,6 @@ maven.dist.crlf.filter=**/*.txt
 maven.dist.lf.filter=
 maven.dist.bin.include.site=true
 maven.dist.bin.artifact.type=jar
-maven.dist.formats=zip,tgz
\ No newline at end of file
+maven.dist.formats=zip,tgz
+maven.dist.bin.includes=README*,LICENSE*,NOTICE*
+maven.dist.src.includes=README*,LICENSE*,NOTICE*,project.properties,maven.xml,project.xml
diff --git a/dist/src/plugin-test/project.properties b/dist/src/plugin-test/project.properties
index ed254827..7c384679 100644
--- a/dist/src/plugin-test/project.properties
+++ b/dist/src/plugin-test/project.properties
@@ -1 +1 @@
-maven.dist.src.include=custom.txt,doesntexists.txt
+maven.dist.src.includes=maven.xml,project.properties,project.xml,custom.txt,doesntexists.txt
diff --git a/dist/xdocs/changes.xml b/dist/xdocs/changes.xml
index b252114f..72859b6c 100644
--- a/dist/xdocs/changes.xml
+++ b/dist/xdocs/changes.xml
@@ -24,6 +24,11 @@
   </properties>
   <body>
     <release version="1.7.1-SNAPSHOT" date="In SVN">
+      <action dev="ltheussl" type="fix" issue="MPDIST-20" due-to="Phil Steitz">Fix combined javadoc classpath in <code>dist:multiproject-bin</code>.</action>
+      <action dev="ltheussl" type="update" issue="MPDIST-20" due-to="Phil Steitz">New
+        <code>maven.dist.src.includes</code> and <code>maven.dist.bin.includes</code> properties.
+        Removed the <code>maven.dist.src.include</code> property.
+      </action>
       <action dev="ltheussl" type="fix"><code>dist:multiproject-bin</code> fails if one of the projects does not have any java sources.</action>
       <action dev="ltheussl" type="fix" issue="MPDIST-29">Source distribution archive has incorrect directory structure.</action>
     </release>
diff --git a/dist/xdocs/properties.xml b/dist/xdocs/properties.xml
index cdd1ff22..28233be5 100644
--- a/dist/xdocs/properties.xml
+++ b/dist/xdocs/properties.xml
@@ -52,11 +52,6 @@
           <td>yes - default is ${maven.dist.assembly.dir}/src/${maven.final.name}</td>
           <td>The directory where the sources are copied to so that it can be archived</td>
         </tr>
-        <tr>
-          <td>maven.dist.src.include</td>
-          <td>yes</td>
-          <td>Comma delimited list of additional files which should be included in the source distribution</td>
-        </tr>
         <tr>
           <td>maven.dist.include.dirs</td>
           <td>yes</td>
@@ -117,6 +112,20 @@
             Possible values are tgz and zip.
           </td>
         </tr>
+        <tr>
+          <td>maven.dist.bin.includes</td>
+          <td>yes - default is <code>README*,LICENSE*,NOTICE*</code>.</td>
+          <td>
+            A comma-separated list of files to include in the binary distribtion.
+          </td>
+        </tr>
+        <tr>
+          <td>maven.dist.src.includes</td>
+          <td>yes - default is <code>README*,LICENSE*,NOTICE*,project.properties,maven.xml,project.xml</code>.</td>
+          <td>
+            A comma-separated list of files to include in the source distribtion.
+          </td>
+        </tr>
       </table>
     </section>
   </body>
