diff --git a/eclipse/src/plugin-resources/templates/classpath.jelly b/eclipse/src/plugin-resources/templates/classpath.jelly
index 8ae17aec..d6a9b0d4 100644
--- a/eclipse/src/plugin-resources/templates/classpath.jelly
+++ b/eclipse/src/plugin-resources/templates/classpath.jelly
@@ -115,36 +115,36 @@
     <classpathentry kind="var" path="MAVEN_REPO/cactus/jars/cactus-${depVersion}.jar"/>
   </j:if>
 
-  <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <j:forEach var="lib" items="${pom.artifacts}">
-      <j:set var="eclipseDependency"
-             value="${lib.dependency.getProperty('eclipse.dependency')}"/>
-      <j:choose>
-        <j:when test="${eclipseDependency == 'true'}">
-          <classpathentry kind="src" path="/${lib.dependency.artifactId}"/>
-        </j:when>
-        <j:when test="${lib.dependency.groupId == 'junit'}">
-          <!-- ignoring junit dependency as we've already created it -->
-        </j:when>
-        <j:otherwise>
-          <!-- make sure it's a classpath dependency -->
-          <j:set var="isClasspath" value="${lib.dependency.isAddedToClasspath()}"/>
-          <j:if test="${isClasspath}">
-            <classpathentry kind="var" path="MAVEN_REPO${lib.urlPath}"/>
-          </j:if>
-        </j:otherwise>
-      </j:choose>
-    </j:forEach>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <j:forEach var="lib" items="${pom.artifacts}">
+    <j:set var="eclipseDependency"
+           value="${lib.dependency.getProperty('eclipse.dependency')}"/>
+    <j:choose>
+      <j:when test="${eclipseDependency == 'true'}">
+        <classpathentry kind="src" path="/${lib.dependency.artifactId}"/>
+      </j:when>
+      <j:when test="${lib.dependency.groupId == 'junit'}">
+        <!-- ignoring junit dependency as we've already created it -->
+      </j:when>
+      <j:otherwise>
+        <!-- make sure it's a classpath dependency -->
+        <j:set var="isClasspath" value="${lib.dependency.isAddedToClasspath()}"/>
+        <j:if test="${isClasspath}">
+          <classpathentry kind="var" path="MAVEN_REPO${lib.urlPath}"/>
+        </j:if>
+      </j:otherwise>
+    </j:choose>
+  </j:forEach>
     
-    <!-- add the unit test build directory so that any files generated via Maven are available -->  
+  <!-- add the unit test build directory so that any files generated via Maven are available -->  
   
-    <j:set var="outputDir" value="${maven.eclipse.output.dir}"/>
-    <j:if test="${empty outputDir}">
-      <j:set var="outputDir" value="${maven.build.dest}"/>      
-    </j:if>
-    <maven:makeRelativePath var="outputDir" basedir="${basedir}" path="${outputDir}" />
-    <classpathentry kind="output" path="${outputDir}"/>
-    <ant:echo>Setting default output directory to ${outputDir}</ant:echo>
-  </classpath>
+  <j:set var="outputDir" value="${maven.eclipse.output.dir}"/>
+  <j:if test="${empty outputDir}">
+    <j:set var="outputDir" value="${maven.build.dest}"/>      
+  </j:if>
+  <maven:makeRelativePath var="outputDir" basedir="${basedir}" path="${outputDir}" />
+  <classpathentry kind="output" path="${outputDir}"/>
+  <ant:echo>Setting default output directory to ${outputDir}</ant:echo>
+</classpath>
 
 </j:whitespace>
diff --git a/eclipse/xdocs/changes.xml b/eclipse/xdocs/changes.xml
index ed58ff25..d3949007 100644
--- a/eclipse/xdocs/changes.xml
+++ b/eclipse/xdocs/changes.xml
@@ -26,6 +26,7 @@
   <body>
     <release version="1.7-SNAPSHOT" date="in CVS">
       <action dev="brett" type="update" issue="MPECLIPSE-21">Honour sourceModifications in classpath file</action>
+      <action dev="dion" type="fix" issue="MPECLIPSE-22">used container for JRE classpath</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>
