diff --git a/javadoc/plugin.jelly b/javadoc/plugin.jelly
index 50e8f46f..086dfe7c 100644
--- a/javadoc/plugin.jelly
+++ b/javadoc/plugin.jelly
@@ -148,9 +148,15 @@ internal.javadoc.working.dir      = [${internal.javadoc.working.dir}]
             <!-- If we have not already find sources -->
             <j:if test="${internal.javadoc.needed != true}">
               <!-- We construct the fileset -->
-  
+              <j:set var="includes" value="**/*.java" />
+              <util:replace var="packageDir" newChar="/" oldChar="." value="${pom.package}" />
+              <j:if test="${!empty(packageDir)}">
+                <j:set var="includes" value="${packageDir}/**/*.java" />
+              </j:if>
               <ant:fileScanner var="sources">
-                <ant:fileset dir="${dir}" include="**/*.java"/>
+                <ant:fileset dir="${dir}">
+                  <ant:include name="${includes}" />
+                </ant:fileset>
               </ant:fileScanner>
     
               <j:set var="internal.javadoc.needed" scope="parent" 
@@ -507,4 +513,4 @@ internal.javadoc.working.dir      = [${internal.javadoc.working.dir}]
   <goal name="javadoc:generate" prereqs="maven-javadoc-plugin:report"/> 
   <goal name="javadoc" prereqs="maven-javadoc-plugin:report"/>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/javadoc/project.xml b/javadoc/project.xml
index 2dd92056..63eeaf13 100644
--- a/javadoc/project.xml
+++ b/javadoc/project.xml
@@ -23,7 +23,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-javadoc-plugin</id>
   <name>Maven Javadoc Plug-in</name>
-  <currentVersion>1.6</currentVersion>
+  <currentVersion>1.6.1-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>Produce Javadocs and report</shortDescription>
   <url>http://maven.apache.org/reference/plugins/javadoc/</url>
diff --git a/javadoc/xdocs/changes.xml b/javadoc/xdocs/changes.xml
index 0d180735..b0c27e04 100644
--- a/javadoc/xdocs/changes.xml
+++ b/javadoc/xdocs/changes.xml
@@ -25,6 +25,9 @@
     <author email="evenisse@ifrance.com">Emmanuel Venisse</author>
   </properties>
   <body>
+    <release version="1.6.1-SNAPSHOT" date="in CVS">
+      <action dev="brett" type="fix">Correct check needed function for when package is given but there are not java files in it.</action>
+    </release>
     <release version="1.6" date="2004-07-09">
       <action dev="aheritier" type="fix" issue="MPJAVADOC-33">Javadoc plugin ignores the package specified in the pom.</action>
       <action dev="aheritier" type="fix" issue="MPJAVADOC-32" due-to="Guillaume Nodet">The maven-javadoc-plugin:register failed in javadoc plugin 1.5.1-SNAPSHOT.</action>
