diff --git a/eclipse/src/plugin-resources/templates/classpath.jelly b/eclipse/src/plugin-resources/templates/classpath.jelly
index 3b6ed1f8..8ae17aec 100644
--- a/eclipse/src/plugin-resources/templates/classpath.jelly
+++ b/eclipse/src/plugin-resources/templates/classpath.jelly
@@ -31,11 +31,20 @@
     <maven:makeRelativePath var="srcDir" basedir="${basedir}" path="${pom.build.sourceDirectory}"/>
     <j:set var="excluding" value=""/>
     <j:forEach var="sm" items="${pom.build.sourceModifications}">
-      <j:forEach var="exclude" items="${sm.excludes}">
-        <j:set var="excluding" value="${excluding},${exclude}"/>
-      </j:forEach>
+      <ant:available property="classPresent" classname="${sm.className}"/>
+      <j:if test="${classPresent != 'true'}">
+        <j:forEach var="exclude" items="${sm.excludes}">
+          <j:choose>
+            <j:when test="${excluding.length() == 0}">
+              <j:set var="excluding" value="${exclude}"/>
+            </j:when>
+            <j:otherwise>
+              <j:set var="excluding" value="${excluding},${exclude}"/>
+            </j:otherwise>
+          </j:choose>
+        </j:forEach>
+      </j:if>
     </j:forEach>
-    <j:set var="excluding">${excluding.substring(1)}</j:set> 
     <classpathentry kind="src" path="${srcDir}" excluding="${excluding}" />
   </j:if>
   
diff --git a/eclipse/xdocs/changes.xml b/eclipse/xdocs/changes.xml
index 0336e7a4..ed58ff25 100644
--- a/eclipse/xdocs/changes.xml
+++ b/eclipse/xdocs/changes.xml
@@ -25,7 +25,7 @@
   </properties>
   <body>
     <release version="1.7-SNAPSHOT" date="in CVS">
-      <action dev="brett" type="update" due-to="Boris Boehlen" issue="MPECLIPSE-21">Honour sourceModifications in classpath file</action>
+      <action dev="brett" type="update" issue="MPECLIPSE-21">Honour sourceModifications in classpath file</action>
     </release>
     <release version="1.6" date="2004-03-10">
       <action dev="vmassol" type="fix" issue="MPECLIPSE-15">Fixed Cactus support (there were problems due to the move of the Cactus plugin outside of the Maven project).</action>
