diff --git a/javadoc/src/plugin-test/test04/.cvsignore b/javadoc/src/plugin-test/test04/.cvsignore
new file mode 100644
index 00000000..64d85f5a
--- /dev/null
+++ b/javadoc/src/plugin-test/test04/.cvsignore
@@ -0,0 +1,5 @@
+gump.xml
+*.log
+targetdist
+dist
+target
diff --git a/javadoc/src/plugin-test/test04/maven.xml b/javadoc/src/plugin-test/test04/maven.xml
new file mode 100644
index 00000000..ca8bba7f
--- /dev/null
+++ b/javadoc/src/plugin-test/test04/maven.xml
@@ -0,0 +1,38 @@
+<!-- 
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+<project xmlns:util="jelly:util"
+         xmlns:maven="jelly:maven"
+         xmlns:j="jelly:core"
+         xmlns:assert="assert"
+         xmlns:ant="jelly:ant">
+         
+  <goal name="testPlugin">
+    <delete dir="${maven.build.dir}" failonerror="false"/>
+    <delete file="${maven.build.dir}/${maven.final.name}_javadoc.jar" failonerror="false"/>
+    <attainGoal name="javadoc"/>
+    <assert:assertFileExists file="${maven.javadoc.destdir}/index.html"/>
+    <!-- assert that doc-files are copied - Issue MPJAVADOC-24 -->
+    <assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven/doc-files/example.txt"/>
+    <!-- assert that javadoc for classes Dummy, Dummy2, Dummy3, Dummy4 are generated -->
+    <assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven/Dummy.html"/>
+    <assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven/Dummy2.html"/>
+    <!-- assert that javadoc for the package org.apache.maven2 isn't generated -->
+    <assert:assertFileNotFound file="${maven.javadoc.destdir}/org/apache/maven2"/>
+  </goal>
+
+</project>
\ No newline at end of file
diff --git a/javadoc/src/plugin-test/test04/project.xml b/javadoc/src/plugin-test/test04/project.xml
new file mode 100644
index 00000000..57d61531
--- /dev/null
+++ b/javadoc/src/plugin-test/test04/project.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+
+
+<project>
+  <pomVersion>3</pomVersion>
+  <id>test-maven-javadoc-plugin-04</id>
+  <name>Several packages but only one selected for javadoc (MPJAVADOC-33)</name>
+  <groupId>maven</groupId>
+  <currentVersion>1.0-SNAPSHOT</currentVersion>
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://www.apache.org/</url>
+    <logo>http://maven.apache.org/images/apache-maven-project.png</logo>
+  </organization>
+  <inceptionYear>2001</inceptionYear>
+  <package>org.apache.maven</package>
+  <logo>http://maven.apache.org/images/maven.jpg</logo>
+  <description>Several packages but only one selected for javadoc (MPJAVADOC-33)</description>
+  <shortDescription>Several packages but only one selected for javadoc (MPJAVADOC-33)</shortDescription>
+  <url>http://maven.apache.org/reference/plugins/javadoc/index.html</url>
+  <siteDirectory>/www/maven.apache.org/reference/plugins/javadoc/</siteDirectory>
+  <repository>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/javadoc/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/javadoc/</url>
+  </repository>
+  <developers>
+    <developer>
+      <name>dIon Gillard</name>
+      <id>dion</id>
+      <email>dion@multitask.com.au</email>
+      <organization>Multitask Consulting</organization>
+      <roles>
+        <role>Documentation</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Arnaud Heritier</name>
+      <id>aheritier</id>
+      <email>aheritier@apache.org</email>
+      <roles>
+        <role>Developer</role>
+      </roles>
+    </developer>
+  </developers>
+
+  <build>
+    <sourceDirectory>src/main</sourceDirectory>
+    <sourceModifications>
+      <sourceModification>
+        <className>org.apache.maven.Dummy</className>
+        <excludes>
+          <exclude>**/Dummy4.*</exclude>
+        </excludes>
+      </sourceModification>
+    </sourceModifications>
+  </build>
+</project>
\ No newline at end of file
diff --git a/javadoc/src/plugin-test/test04/src/main/org/apache/maven/Dummy.java b/javadoc/src/plugin-test/test04/src/main/org/apache/maven/Dummy.java
new file mode 100644
index 00000000..3540d6cd
--- /dev/null
+++ b/javadoc/src/plugin-test/test04/src/main/org/apache/maven/Dummy.java
@@ -0,0 +1,8 @@
+package org.apache.maven;
+
+public class Dummy
+{
+    public String badChecky = "error";
+
+    public Dummy() {}
+} 
diff --git a/javadoc/src/plugin-test/test04/src/main/org/apache/maven/Dummy2.java b/javadoc/src/plugin-test/test04/src/main/org/apache/maven/Dummy2.java
new file mode 100644
index 00000000..a8f60c78
--- /dev/null
+++ b/javadoc/src/plugin-test/test04/src/main/org/apache/maven/Dummy2.java
@@ -0,0 +1,8 @@
+package org.apache.maven;
+
+public class Dummy2
+{
+    public String badChecky = "error";
+
+    public Dummy dummy = new Dummy();
+} 
diff --git a/javadoc/src/plugin-test/test04/src/main/org/apache/maven/doc-files/example.txt b/javadoc/src/plugin-test/test04/src/main/org/apache/maven/doc-files/example.txt
new file mode 100644
index 00000000..78264689
--- /dev/null
+++ b/javadoc/src/plugin-test/test04/src/main/org/apache/maven/doc-files/example.txt
@@ -0,0 +1 @@
+This an example
\ No newline at end of file
diff --git a/javadoc/src/plugin-test/test04/src/main/org/apache/maven/package.html b/javadoc/src/plugin-test/test04/src/main/org/apache/maven/package.html
new file mode 100644
index 00000000..545e7eb8
--- /dev/null
+++ b/javadoc/src/plugin-test/test04/src/main/org/apache/maven/package.html
@@ -0,0 +1,7 @@
+<html>
+<head></head>
+<body>
+Package documentation. <br/>
+<a href="doc-files/example.txt">example.txt</a> in doc-files directory.
+</body>
+</html>
\ No newline at end of file
diff --git a/javadoc/src/plugin-test/test04/src/main/org/apache/maven2/Dummy3.java b/javadoc/src/plugin-test/test04/src/main/org/apache/maven2/Dummy3.java
new file mode 100644
index 00000000..cd88a1f3
--- /dev/null
+++ b/javadoc/src/plugin-test/test04/src/main/org/apache/maven2/Dummy3.java
@@ -0,0 +1,10 @@
+package org.apache.maven2;
+
+/**
+ * Test MPJAVADOC-28 : {@link org.apache.maven}
+ * 
+ */
+public class Dummy3
+{
+    public String badChecky = "error";
+} 
\ No newline at end of file
diff --git a/javadoc/src/plugin-test/test04/src/main/org/apache/maven2/Dummy4.java b/javadoc/src/plugin-test/test04/src/main/org/apache/maven2/Dummy4.java
new file mode 100644
index 00000000..fb3cae97
--- /dev/null
+++ b/javadoc/src/plugin-test/test04/src/main/org/apache/maven2/Dummy4.java
@@ -0,0 +1,6 @@
+package org.apache.maven2;
+
+public class Dummy4
+{
+    public String badChecky = "error";
+} 
\ No newline at end of file
diff --git a/javadoc/src/plugin-test/test04/src/main/org/apache/maven2/doc-files/example.txt b/javadoc/src/plugin-test/test04/src/main/org/apache/maven2/doc-files/example.txt
new file mode 100644
index 00000000..78264689
--- /dev/null
+++ b/javadoc/src/plugin-test/test04/src/main/org/apache/maven2/doc-files/example.txt
@@ -0,0 +1 @@
+This an example
\ No newline at end of file
diff --git a/javadoc/src/plugin-test/test04/src/main/org/apache/maven2/package.html b/javadoc/src/plugin-test/test04/src/main/org/apache/maven2/package.html
new file mode 100644
index 00000000..545e7eb8
--- /dev/null
+++ b/javadoc/src/plugin-test/test04/src/main/org/apache/maven2/package.html
@@ -0,0 +1,7 @@
+<html>
+<head></head>
+<body>
+Package documentation. <br/>
+<a href="doc-files/example.txt">example.txt</a> in doc-files directory.
+</body>
+</html>
\ No newline at end of file