diff --git a/javadoc/plugin.jelly b/javadoc/plugin.jelly
index d9bf60ec..852d195c 100644
--- a/javadoc/plugin.jelly
+++ b/javadoc/plugin.jelly
@@ -300,26 +300,36 @@ internal.javadoc.working.dir      = [${internal.javadoc.working.dir}]
       </j:choose>
       
       <ant:javadoc
-        packagenames="${packageNamesValue}"
-        destdir="${maven.javadoc.destdir}"
-        author="${maven.javadoc.author}"
-        public="${maven.javadoc.public}"
-        package="${maven.javadoc.package}" 
-        private="${maven.javadoc.private}"
-        version="${maven.javadoc.version}"
-        use="${maven.javadoc.use}"
-        windowtitle="${maven.javadoc.windowtitle}"
-        doctitle="${maven.javadoc.windowtitle}"
-        stylesheetfile="${maven.javadoc.stylesheet}"
-        additionalparam="${maven.javadoc.additionalparam}"
-        useexternalfile="${maven.javadoc.useexternalfile}"
-        verbose="${maven.javadoc.debug}"
+        packagenames    ="${packageNamesValue}"
+        destdir         ="${maven.javadoc.destdir}"
+        author          ="${maven.javadoc.author}"
+        public          ="${maven.javadoc.public}"
+        package         ="${maven.javadoc.package}" 
+        private         ="${maven.javadoc.private}"
+        version         ="${maven.javadoc.version}"
+        use             ="${maven.javadoc.use}"
+        windowtitle     ="${maven.javadoc.windowtitle}"
+        doctitle        ="${maven.javadoc.windowtitle}"
+        stylesheetfile  ="${maven.javadoc.stylesheet}"
+        additionalparam ="${maven.javadoc.additionalparam}"
+        useexternalfile ="${maven.javadoc.useexternalfile}"
+        verbose         ="${maven.javadoc.debug}"
         >
 
         <ant:sourcepath>
           <ant:path refid="internal.javadoc.sources"/>
         </ant:sourcepath>
 
+        <j:if test="${pom.package == null or pom.package.equals('')}">
+          <util:tokenize var="sources.dirs" delim="${path.separator}">${context.getAntProject().getReferences().get('maven.compile.src.set')}</util:tokenize>
+          <j:forEach var="dir" items="${sources.dirs}">
+            <ant:fileset dir="${dir}">
+              <ant:include name="*.java"/>
+            </ant:fileset>
+          </j:forEach>
+        </j:if>
+
+
         <j:if test="${context.getVariable('maven.javadoc.source') != null}">
           <ant:setProperty name="source" value="${maven.javadoc.source}" />
         </j:if>
@@ -418,6 +428,24 @@ internal.javadoc.working.dir      = [${internal.javadoc.working.dir}]
 
       </ant:javadoc>
       
+      <j:if test="${pom.package == null or pom.package.equals('')}">
+        <!-- 
+        Because the javadoc doesn't copy 
+        automatically doc-files directories if we don't
+        specify a package, we must do it manually.
+        -->
+        <ant:copy todir="${maven.javadoc.destdir}">
+          
+        <util:tokenize var="sources.dirs" delim="${path.separator}">${context.getAntProject().getReferences().get('maven.compile.src.set')}</util:tokenize>
+          
+          <j:forEach var="dir" items="${sources.dirs}">      
+            <ant:fileset dir="${dir}">
+              <ant:include name="**/doc-files/**/*"/>
+            </ant:fileset>
+          </j:forEach>
+        </ant:copy>
+      </j:if>
+      
       <ant:record name="${internal.javadoc.working.dir}/report.txt" action="stop" />
 
       <j:set var="genDocs" value="${maven.gen.docs}" />
diff --git a/javadoc/src/plugin-test/test05/maven.xml b/javadoc/src/plugin-test/test05/maven.xml
index 596eb313..9df1e5b0 100644
--- a/javadoc/src/plugin-test/test05/maven.xml
+++ b/javadoc/src/plugin-test/test05/maven.xml
@@ -27,12 +27,10 @@
     <attainGoal name="javadoc"/>
     <assert:assertFileExists file="${maven.javadoc.destdir}/index.html"/>
     <!-- assert that doc-files are copied - Issue MPJAVADOC-24 -->
-    <!-- Doesn't work actually in this case :-( -->
-    <!-- <assert:assertFileExists file="${maven.javadoc.destdir}/test/doc-files/example.txt"/> -->
+    <assert:assertFileExists file="${maven.javadoc.destdir}/test/doc-files/example.txt"/>
     <!-- assert that javadoc for classes Dummy, Dummy2, Dummy3 are generated -->
-    <!-- Doesn't work actually in this case :-( -->
-    <!-- <assert:assertFileExists file="${maven.javadoc.destdir}/Dummy.html"/> -->
-    <!-- <assert:assertFileExists file="${maven.javadoc.destdir}/Dummy2.html"/> -->
+    <assert:assertFileExists file="${maven.javadoc.destdir}/Dummy.html"/>
+    <assert:assertFileExists file="${maven.javadoc.destdir}/Dummy2.html"/>
     <assert:assertFileExists file="${maven.javadoc.destdir}/test/Dummy3.html"/>
   </goal>