diff --git a/java/plugin.jelly b/java/plugin.jelly
index 70a30207..64c2771a 100644
--- a/java/plugin.jelly
+++ b/java/plugin.jelly
@@ -35,14 +35,7 @@
     <ant:mkdir dir="${maven.build.dest}"/>
   </goal>
 
-  <!-- ================================================================== -->
-  <!-- C O M P I L E                                                      -->
-  <!-- ================================================================== -->
-
-  <goal name="java:compile"
-        description="Compile the project"
-        prereqs="java:prepare-filesystem">
-
+  <goal name="java:init">
     <j:set var="generatedSourcesPresent" value="false"/>
     <j:if test="${bootstrapping == null}">
       <maven:get var="generatedSources" plugin="maven-javacc-plugin" property="maven.gen.src" />
@@ -55,6 +48,15 @@
         <maven:addPath id="maven.compile.src.set" refid="maven.generated.src.set"/>
       </j:if>
     </j:if>
+  </goal>
+
+  <!-- ================================================================== -->
+  <!-- C O M P I L E                                                      -->
+  <!-- ================================================================== -->
+
+  <goal name="java:compile"
+        description="Compile the project"
+        prereqs="java:prepare-filesystem,java:init">
 
     <j:choose>
       <j:when test="${sourcesPresent == 'true' or generatedSourcesPresent == 'true'}">
@@ -212,13 +214,14 @@
   <!-- J A V A    R E P O R T S                                           -->
   <!-- ================================================================== -->
 
-  <goal name="maven-java-plugin:register">
+  <goal name="maven-java-plugin:register" prereqs="java:init">
+    <j:if test="${sourcesPresent == 'true' or generatedSourcesPresent == 'true'}">
     <doc:registerReport
       name="Compiler output Report"
       pluginName="maven-java-plugin"
       link="java-compiler-output-report"
-      description="Formatted report of compiler output"
-      />
+      description="Formatted report of compiler output"/>
+    </j:if>
   </goal>
   
   <goal name="maven-java-plugin:deregister">
diff --git a/java/project.xml b/java/project.xml
index 0065754c..9be5f2ef 100644
--- a/java/project.xml
+++ b/java/project.xml
@@ -22,7 +22,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-java-plugin</id>
   <name>Maven Java Plugin</name>
-  <currentVersion>1.6</currentVersion>
+  <currentVersion>1.6.1-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>Compile java code</shortDescription>
   <versions>
diff --git a/java/xdocs/changes.xml b/java/xdocs/changes.xml
index 418477b8..ff28d0ee 100644
--- a/java/xdocs/changes.xml
+++ b/java/xdocs/changes.xml
@@ -24,6 +24,9 @@
     <author email="kschrader@karmalab.org">Kurt Schrader</author>
   </properties>
   <body>
+    <release version="1.6.1" date="in SVN">
+      <action dev="ltheussl" type="fix" issue="MPJAVA-45">Java report fails build if no source files present.</action>
+    </release>
     <release version="1.6" date="2006-03-26">
       <action dev="ltheussl" type="fix" issue="MPJAVA-4">Compile fails using forked compiler when directory contains spaces.</action>
       <action dev="ltheussl" type="fix" issue="MPJAVA-42">Also check for
