diff --git a/dist/plugin.jelly b/dist/plugin.jelly
index 51ce036d..b0a41139 100644
--- a/dist/plugin.jelly
+++ b/dist/plugin.jelly
@@ -4,7 +4,8 @@
   xmlns:j="jelly:core"
   xmlns:ant="jelly:ant"
   xmlns:maven="jelly:maven"
-  xmlns:deploy="deploy">
+  xmlns:deploy="deploy"
+  xmlns:util="jelly:util">
 
   <!-- ================================================================== -->
   <!-- D I S T R I B U T I O N S                                          -->
@@ -84,20 +85,24 @@
 
     <j:choose>
       <j:when test="${maven.dist.build.xml.avail}">
-        <ant:copy todir="${maven.dist.src.assembly.dir}" file="build.xml"/>
+        <ant:copy todir="${maven.dist.src.assembly.dir}" file="${basedir}/build.xml"/>
       </j:when>
       <j:otherwise>
-        <attainGoal name="ant:generate-build"/>
-        <ant:move 
-          file="${basedir}/build.xml"
-          tofile="${maven.dist.src.assembly.dir}/build.xml"/>
+        <j:if test="${sourcesPresent == 'true'}">
+          <attainGoal name="ant:generate-build"/>
+          <ant:move 
+            file="${basedir}/build.xml"
+            tofile="${maven.dist.src.assembly.dir}/build.xml"/>
+        </j:if>
       </j:otherwise>
     </j:choose>
 
     <!-- Copy Source -->
-    <ant:copy todir="${maven.dist.src.assembly.dir}/src">
-      <ant:fileset dir="${maven.src.dir}" />
-    </ant:copy>
+    <util:available file="${maven.src.dir}">
+      <ant:copy todir="${maven.dist.src.assembly.dir}/src">
+        <ant:fileset dir="${maven.src.dir}" />
+      </ant:copy>
+    </util:available>
   </goal>
 
   <goal name="dist"