diff --git a/jcoverage/plugin.jelly b/jcoverage/plugin.jelly
index 03c8a0a7..e2dc0077 100644
--- a/jcoverage/plugin.jelly
+++ b/jcoverage/plugin.jelly
@@ -121,10 +121,16 @@
 
       <maven:addPath id="maven.dependency.classpath" refid="jcoverage.classpath"/>
 
+
+      <u:tokenize var="maven.jcoverage.instrumentation.excludes.split" delim=",">${maven.jcoverage.instrumentation.excludes}</u:tokenize>
+
       <instrument todir="${maven.jcoverage.instrumentation}">
-        <ant:fileset dir="${maven.build.dest}"
-            includes="${maven.jcoverage.instrumentation.includes}"
-            excludes="${maven.jcoverage.instrumentation.excludes}"/>
+        <ant:fileset dir="${maven.build.dest}">
+          <ant:include name="${maven.jcoverage.instrumentation.includes}" />
+          <j:forEach var="var" items="${maven.jcoverage.instrumentation.excludes.split}">
+            <ant:exclude name="${var}" />
+          </j:forEach>
+        </ant:fileset>
         <ant:classpath>
           <ant:path refid="jcoverage.classpath"/>
         </ant:classpath>
@@ -133,7 +139,11 @@
       <ant:copy todir="${maven.jcoverage.instrumentation}">
         <ant:fileset dir="${maven.build.dest}">
           <ant:exclude name="**/*.class" />
-          <ant:exclude name="${maven.jcoverage.instrumentation.excludes}" />
+        </ant:fileset>
+        <ant:fileset dir="${maven.build.dest}">
+          <j:forEach var="var" items="${maven.jcoverage.instrumentation.excludes.split}">
+            <ant:include name="${var}" />
+          </j:forEach>
         </ant:fileset>
       </ant:copy>
 
diff --git a/jcoverage/xdocs/changes.xml b/jcoverage/xdocs/changes.xml
index 36501012..6ef2e196 100644
--- a/jcoverage/xdocs/changes.xml
+++ b/jcoverage/xdocs/changes.xml
@@ -26,6 +26,8 @@
   <body>
     <release version="1.0.10" date="IN CVS">
       <action dev="evenisse" type="fix">Open report in a new window.</action>
+      <action dev="evenisse" type="fix" issue="MPJCOVERAGE-20">Allow comma separeted values for maven.jcoverage.instrumentation.excludes.</action>
+      <action dev="evenisse" type="fix" issue="MPJCOVERAGE-16">Fix tests failures when user use maven.jcoverage.instrumentation.excludes</action>
     </release>
     <release version="1.0.9" date="2004-11-10">
       <action dev="brett" type="fix">Fix incorrect usage of maven:addPath tag</action>
diff --git a/jcoverage/xdocs/properties.xml b/jcoverage/xdocs/properties.xml
index 9cb315c9..dd9134d5 100644
--- a/jcoverage/xdocs/properties.xml
+++ b/jcoverage/xdocs/properties.xml
@@ -69,7 +69,7 @@
           <td>Not defined</td>
           <td>Yes</td>
           <td>
-            Specifies the pattern for the excluded classes of instrumentation.
+            Specifies the pattern for the excluded classes of instrumentation. It's a comma separated property.
           </td>
         </tr>
         <!--tr>
