diff --git a/eclipse/plugin.jelly b/eclipse/plugin.jelly
index 608a214a..84060619 100644
--- a/eclipse/plugin.jelly
+++ b/eclipse/plugin.jelly
@@ -187,7 +187,8 @@
             <j:when test="${allGoals == 'all'}">
               <j:set var="maven.eclipse.generate" value="true" />
             </j:when>
-            <j:otherwise>
+            <j:otherwise> <!-- = plugins -->
+              <!-- Only main goals for plugins -->
               <j:if test="${goal.indexOf(':') == '-1'}">
                 <j:set var="maven.eclipse.generate" value="true" />
               </j:if>
diff --git a/eclipse/plugin.properties b/eclipse/plugin.properties
index e1ff086d..98de81da 100644
--- a/eclipse/plugin.properties
+++ b/eclipse/plugin.properties
@@ -24,18 +24,68 @@
 # This accepts two values: 'all' for all the goals, 
 # and 'plugins' to generate only the plugins' default goals.
 maven.eclipse.goals = plugins
-maven.eclipse.project.name=${pom.artifactId}
-maven.gen.src=${maven.build.dir}/generated-sources
-maven.eclipse.src.extension = zip
-maven.eclipse.src.download = true
-maven.eclipse.javadoc.download = true
+
+# Location of the Eclipse workspace that holds your configuration (and source).
+#maven.eclipse.workspace
+
+# The version of JUnit you want added to your project. If this property is set to none then JUnit will not be added to your build classpath.
+#maven.eclipse.junit
+
+# The directory to which Eclipse should output its classes. By default this is the same directory as Maven generates its code however this can be changed so that maven clean does not interfere with Eclipse's build. 
+#maven.eclipse.output.dir
+
+# The directory to which Eclipse should output its test classes.
+#maven.eclipse.test.output.dir
+
+# Comma delimited list of additional source directories to include in the classpath, like src/conf.
+#maven.eclipse.classpath.include
+
+# Specify whether to include the resources defined in the POM in the Eclipse classpath. Defaults to false.
 maven.eclipse.resources.addtoclasspath=false
-maven.eclipse.servletapilist=javax.servlet:servlet-api,servletapi:servletapi,geronimo-spec:geronimo-spec-servlet
+ 
+# Comma delimited list of additional kind "con" path to include in the classpath description file like org.eclipse.pde.core.requiredPlugins
+#maven.eclipse.conclasspath
+
+# Comma delimited list of additional build commands to include in the project description file. The java builder will automatically be added if a java source dir is set (if not already specified in the list).
+#maven.eclipse.buildcommands
+
+# Comma delimited list of additional project natures to include in the project description file. These natures will be added after the java nature (if the java nature is not already specified in the list). 
+#maven.eclipse.projectnatures 
+
+# Name of the generated project on Eclipse.
+maven.eclipse.project.name=${pom.artifactId} 
+
+# The directory that generated source code is placed. Maven will select any directories under this as source code. This prevents the generated source from being removed whenever Eclipse does a clean build, and allows the generated code to be clearly in the build directory.
+maven.gen.src=${maven.build.dir}/generated-sources
+
+# The extension used for source attachments. Deprecated, source attachment are expected now at MAVEN_REPO${groupId}/java-sources/${artifactId}-${version}-sources.jar
+maven.eclipse.src.extension = zip
+
+# Specify if java sources archives need to be downloaded from the configured remote repositories. Defaults to true.
+maven.eclipse.src.download = true
+ 
+# Specify if javadocs archives need to be downloaded from the configured remote repositories, when no source archive is available. Defaults to true.
+maven.eclipse.javadoc.download = true
 
 # Location of subprojects to include in the multichanges report. By default
 # these properties have the same values as their multiproject conterpart.
 # You can define them if you need to set different values.
+
+# This is the base directory that the plugin will use when searching for projects to be processed. It is also the 'current directory' for relative paths 
 #maven.eclipse.multiproject.basedir=
-#maven.eclipse.multiproject.includes=
-#maven.eclipse.multiproject.excludes=
-#maven.eclipse.multiproject.ignoreFailures=
+ 
+# This is the list of file specifications to be included when searching for projects to be processed by the plugin.
+#maven.eclipse.multiproject.includes= 
+
+# This is the list of file specifications to be excluded when searching for projects to be processed by the plugin
+#maven.eclipse.multiproject.excludes= 
+
+# Set this to true to allow the plugin to continue when any project fails during processing.
+#maven.eclipse.multiproject.ignoreFailures= 
+
+###
+# WTP settings
+###
+
+# 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
diff --git a/eclipse/xdocs/goals.xml b/eclipse/xdocs/goals.xml
index e09cab51..475c1ac7 100644
--- a/eclipse/xdocs/goals.xml
+++ b/eclipse/xdocs/goals.xml
@@ -83,8 +83,8 @@
           <name>eclipse:external-tools</name>
           <description>
             <p>
-              Generates an external tool entry for each default goal available to
-              a Maven project into a file named <code>externaltools.xml</code>
+              Generates an external tool entry for each goal available to
+              a Maven project (depending of <a href="properties.html">${maven.eclipse.goals}</a>) into a file named <code>externaltools.xml</code>
             </p>
             <p>
               If the <a href="properties.html">${maven.eclipse.workspace}</a>
diff --git a/eclipse/xdocs/properties.xml b/eclipse/xdocs/properties.xml
index 5e18384c..64ed8190 100644
--- a/eclipse/xdocs/properties.xml
+++ b/eclipse/xdocs/properties.xml
@@ -47,6 +47,21 @@
             </p>
           </td>
         </tr>
+        <tr>
+          <td>maven.eclipse.goals</td>
+          <td>Yes (default=plugins)</td>
+          <td>
+            <p>
+              Generate Eclipse external tools mappings for the specified goals.
+              This accepts two values: 'all' for all the goals, 
+              and 'plugins' to generate only the plugins' default goals.
+            </p>
+            <p>
+              If this parameter is specified, the <a href="goals.html#eclipse:external-tools">
+              external-tools</a> goal will use it as the destination to copy the generated file.
+            </p>
+          </td>
+        </tr>
         <tr>
           <td>maven.eclipse.junit</td>
           <td>Yes (default=3.8.1)</td>