diff --git a/eclipse/plugin.jelly b/eclipse/plugin.jelly
index 7c6ad3db..ef5ef201 100644
--- a/eclipse/plugin.jelly
+++ b/eclipse/plugin.jelly
@@ -154,14 +154,19 @@
   <!--==================================================================-->
   <!-- Generate Eclipse .wtpmodules file                                -->
   <!--==================================================================-->
-  <goal name="eclipse:generate-wtpmodules" description="Generate Eclipse .wtpmodules file">
+  <goal name="eclipse:wtpconfig">
+    <j:set var="modulesConfig0.7" value="${basedir}/.wtpmodules"/>
+    <j:set var="modulesConfig1.5" value="${basedir}/.settings/org.eclipse.wst.common.component"/>
+  </goal>
+  
+  <goal name="eclipse:generate-wtpmodules" description="Generate Eclipse .wtpmodules file" prereqs="eclipse:wtpconfig">
     <j:choose>
       <j:when test="${maven.eclipse.wtp.version==0.7}">
-        <j:set var="modulesConfig" value="${basedir}/.wtpmodules"/>
+        <j:set var="modulesConfig" value="${modulesConfig0.7}"/>
       </j:when>
       <j:when test="${maven.eclipse.wtp.version==1.5}">
         <ant:mkdir dir="${basedir}/.settings"/>
-        <j:set var="modulesConfig" value="${basedir}/.settings/org.eclipse.wst.common.component"/>
+        <j:set var="modulesConfig" value="${modulesConfig1.5}"/>
       </j:when>
       <j:otherwise>
         <ant:fail>maven.eclipse.wtp.version=${maven.eclipse.wtp.version} not supported. Please check the plugin documentation to have the list of supported values.</ant:fail>
@@ -318,13 +323,13 @@
   <!--==================================================================-->
   <!-- Clean up eclipse generated files                                 -->
   <!--==================================================================-->
-  <goal name="eclipse:clean" description="Clean eclipse generated files">
+  <goal name="eclipse:clean" description="Clean eclipse generated files" prereqs="eclipse:wtpconfig">
     <j:set var="projectFileName" value="${basedir}/.project" />
     <j:set var="classpathFileName" value="${basedir}/.classpath" />
-    <j:set var="wtpmodulesFileName" value="${basedir}/.wtpmodules" />
     <ant:delete file="${projectFileName}" />
     <ant:delete file="${classpathFileName}" />
-    <ant:delete file="${wtpmodulesFileName}" />
+    <ant:delete file="${modulesConfig0.7}" />
+    <ant:delete file="${modulesConfig1.5}" />
     <ant:echo>Cleaned up eclipse generated files</ant:echo>
   </goal>