diff --git a/eclipse/plugin.jelly b/eclipse/plugin.jelly
index 84060619..7c6ad3db 100644
--- a/eclipse/plugin.jelly
+++ b/eclipse/plugin.jelly
@@ -155,8 +155,20 @@
   <!-- Generate Eclipse .wtpmodules file                                -->
   <!--==================================================================-->
   <goal name="eclipse:generate-wtpmodules" description="Generate Eclipse .wtpmodules file">
-    <ant:echo>Creating ${basedir}/.wtpmodules ...</ant:echo>
-    <j:file name="${basedir}/.wtpmodules" prettyPrint="true" outputMode="xml" xmlns="dummy">
+    <j:choose>
+      <j:when test="${maven.eclipse.wtp.version==0.7}">
+        <j:set var="modulesConfig" value="${basedir}/.wtpmodules"/>
+      </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: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>
+      </j:otherwise>
+    </j:choose>
+    <ant:echo>Creating ${modulesConfig} ...</ant:echo>
+    <j:file name="${modulesConfig}" prettyPrint="true" outputMode="xml" xmlns="dummy">
       <j:import file="${plugin.resources}/templates/wtpmodules.jelly" inherit="true" />
     </j:file>
   </goal>
diff --git a/eclipse/plugin.properties b/eclipse/plugin.properties
index 98de81da..b8d3814c 100644
--- a/eclipse/plugin.properties
+++ b/eclipse/plugin.properties
@@ -88,4 +88,7 @@ maven.eclipse.javadoc.download = true
 ###
 
 # List of servlet api used to find the servlet version to set in wtp 
-maven.eclipse.servletapilist=javax.servlet:servlet-api,servletapi:servletapi,geronimo-spec:geronimo-spec-servlet
\ No newline at end of file
+maven.eclipse.servletapilist=javax.servlet:servlet-api,servletapi:servletapi,geronimo-spec:geronimo-spec-servlet
+
+# For which version of WTP we have to generate the configuration
+maven.eclipse.wtp.version=1.5
\ No newline at end of file