diff --git a/eclipse/plugin.jelly b/eclipse/plugin.jelly
index 9c08ef49..10f70cf3 100644
--- a/eclipse/plugin.jelly
+++ b/eclipse/plugin.jelly
@@ -31,7 +31,7 @@
 	
 
   <!--==================================================================-->
-  <!-- Generate Eclipse  .classpath file                   -->
+  <!-- Generate Eclipse  .classpath file                                -->
   <!--==================================================================-->    
   <goal name="eclipse:generate-classpath"
     description="Generate Eclipse .classpath file">
diff --git a/eclipse/project.xml b/eclipse/project.xml
index 67c080a2..de3d5a93 100644
--- a/eclipse/project.xml
+++ b/eclipse/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-eclipse-plugin</id>
   <name>Maven Eclipse Plug-in</name>
-  <currentVersion>1.6-dev</currentVersion>
+  <currentVersion>1.6-SNAPSHOT</currentVersion>
   <description>A plugin to generate various files for the Eclipse IDE and ease the use of Maven within that environment</description>
   <shortDescription>Eclipse Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/eclipse/</url>
diff --git a/eclipse/src/plugin-resources/templates/classpath.jelly b/eclipse/src/plugin-resources/templates/classpath.jelly
index b9927dce..ba4981d4 100644
--- a/eclipse/src/plugin-resources/templates/classpath.jelly
+++ b/eclipse/src/plugin-resources/templates/classpath.jelly
@@ -66,7 +66,7 @@
     </j:if>
   </j:if>
 
-  <maven:pluginVar var="cactusSrcDir" plugin='maven-cactus-plugin' property='cactus.src.dir' />
+  <maven:pluginVar var="cactusSrcDir" plugin='cactus-maven' property='cactus.src.dir' />
   <util:available file="${cactusSrcDir}">
     <j:set var="cactusSourcePresent" value="true"/>
   </util:available>
@@ -76,7 +76,7 @@
     <maven:makeRelativePath var="testSrcDir" basedir="${basedir}" path="${cactusSrcDir}" />
     <classpathentry kind="src" path="${testSrcDir}"/>
 
-    <maven:pluginVar var="cactusPlugin" plugin='maven-cactus-plugin' property='plugin' />
+    <maven:pluginVar var="cactusPlugin" plugin='cactus-maven' property='plugin' />
     <j:set var="depVersion">${cactusPlugin.getDependency('cactus').getVersion()}</j:set>
     <classpathentry kind="var" path="MAVEN_REPO/cactus/jars/cactus-${depVersion}.jar"/>
   </j:if>
diff --git a/eclipse/xdocs/changes.xml b/eclipse/xdocs/changes.xml
index e24dcd14..159f73ae 100644
--- a/eclipse/xdocs/changes.xml
+++ b/eclipse/xdocs/changes.xml
@@ -7,6 +7,10 @@
 
   <body>
     <release version="1.6" date="CVS">
+      <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>
       <action dev="epugh" type="add">
         Add support for having multiple other directories
         included in the classpath.
