diff --git a/eclipse/src/plugin-resources/templates/classpath.jelly b/eclipse/src/plugin-resources/templates/classpath.jelly
index fa35ce7c..d92c4e83 100644
--- a/eclipse/src/plugin-resources/templates/classpath.jelly
+++ b/eclipse/src/plugin-resources/templates/classpath.jelly
@@ -4,6 +4,7 @@
   xmlns:util="jelly:util"
   xmlns:ant="jelly:ant"
   xmlns:maven="jelly:maven"
+  xmlns:u="jelly:util"
   xmlns="dummy"
   trim="true">
 
@@ -29,6 +30,14 @@
     <ant:echo>Setting compile of ${testSrcDir} to ${testOutputDir}</ant:echo>
     <classpathentry kind="src" path="${testSrcDir}" output="${testOutputDir}"/>
 
+	<!-- split the list of additional directories for the classpath -->
+	
+    <u:tokenize var="maven.eclipse.classpath.include.split" delim=",">${maven.eclipse.classpath.include}</u:tokenize>
+
+    <!-- add extra directories to be included in the classpath -->
+    <j:forEach var="res" items="${maven.eclipse.classpath.include.split}">
+      <classpathentry kind="src" path="${res}"/>
+    </j:forEach>
 
     <!-- Here are the rules:
          If the project has maven.eclipse.junit property, add that ver of junit
diff --git a/eclipse/xdocs/changes.xml b/eclipse/xdocs/changes.xml
index 88903853..e24dcd14 100644
--- a/eclipse/xdocs/changes.xml
+++ b/eclipse/xdocs/changes.xml
@@ -6,7 +6,13 @@
   </properties>
 
   <body>
-  
+    <release version="1.6" date="CVS">
+      <action dev="epugh" type="add">
+        Add support for having multiple other directories
+        included in the classpath.
+      </action>
+    </release>
+      
     <release version="1.5" date="2003-10-14">
       <action dev="dion" type="fix">
         Only classpath dependencies are generated
diff --git a/eclipse/xdocs/properties.xml b/eclipse/xdocs/properties.xml
index 0bbd0e33..9951cde8 100644
--- a/eclipse/xdocs/properties.xml
+++ b/eclipse/xdocs/properties.xml
@@ -55,6 +55,14 @@
 			The directory to which Eclipse should output its test classes.
           </td>
         </tr>
+        <tr>
+          <td>maven.eclipse.classpath.include</td>
+          <td>Yes</td>
+          <td>
+			Comma delimited list of additional directories to include in 
+			the classpath, like <code>src/conf</code>.
+          </td>
+        </tr>
       </table>
 	  <p>
 		Note that you will need to defined a <code>MAVEN_REPO</code> Java 
