diff --git a/jnlp/plugin.jelly b/jnlp/plugin.jelly
index a33ef72d..a6cc0d5a 100644
--- a/jnlp/plugin.jelly
+++ b/jnlp/plugin.jelly
@@ -82,16 +82,32 @@
                     <j2se version="${maven.jnlp.j2se.version}"
                            initial-heap-size="${maven.jnlp.j2se.heapsize.initial}"
                            maximum-heap-size="${maven.jnlp.j2se.heapsize.max}"/>
-                    <jar href="${maven.final.name}.jar" main="true"/>
+                    <j:set var="mainExists" value="false"/>
 
                     <j:forEach var="lib" items="${pom.dependencies}">
                         <j:if test="${lib.getProperty('jnlp.jar')=='true'}">
-                            <jar href="${lib.artifact}"/>
+                            <j:choose>
+                              <j:when test="${lib.getProperty('jnlp.main.jar')=='true'}">
+                                 <j:set var="mainExists" value="true"/>
+                                  <jar href="${lib.artifact}" main="true"/>
+                              </j:when>
+                              <j:otherwise>
+                                  <jar href="${lib.artifact}"/>
+                              </j:otherwise>
+                            </j:choose>
                         </j:if>
                         <j:if test="${lib.getProperty('jnlp.native.jar')=='true'}">
                             <nativelib href="${lib.artifact}"/>
                         </j:if>
                     </j:forEach>
+                    <j:choose>
+                        <j:when test="${mainExists=='false'}">
+                            <jar href="${maven.final.name}.jar" main="true"/>
+                        </j:when>
+                        <j:otherwise">
+                            <jar href="${maven.final.name}.jar"/>
+                        </j:otherwise>
+                    </j:choose>
                     <!--  This is close to what it WILL look like, but for now it is the ugly ass thing below  it-->
 
                     <u:tokenize var="listOfProperties" delim=" ">${maven.jnlp.properties}</u:tokenize>
diff --git a/jnlp/project.xml b/jnlp/project.xml
index 402807de..bc724454 100644
--- a/jnlp/project.xml
+++ b/jnlp/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-jnlp-plugin</id>
   <name>Maven JNLP Plug-in</name>
-  <currentVersion>1.0</currentVersion>
+  <currentVersion>1.1</currentVersion>
   <shortDescription>JNLP Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jnlp/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/jnlp/</siteDirectory>
diff --git a/jnlp/xdocs/changes.xml b/jnlp/xdocs/changes.xml
new file mode 100644
index 00000000..99ea7672
--- /dev/null
+++ b/jnlp/xdocs/changes.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<document>
+  <properties>
+    <title>Changes</title>
+    <author email="dion@multitask.com.au">dIon Gillard</author>
+  </properties>
+
+  <body>
+    <release version="1.1" date="in CVS">
+      <action dev="evenisse" type="add" due-to="Dominique Collette">
+        Add the possibility to choose the main jar.
+      </action>
+    </release>
+  </body>
+</document>
+
diff --git a/jnlp/xdocs/properties.xml b/jnlp/xdocs/properties.xml
index 92f57a74..1a138089 100644
--- a/jnlp/xdocs/properties.xml
+++ b/jnlp/xdocs/properties.xml
@@ -361,6 +361,28 @@
       </properties>
     </dependency>
   ]]></source>
-      </section>
+    </section>
+    <section name="How to define the main jar?">
+      <p>
+        When you define the main class of your application, you must define the jar
+        that contains the main class. This is achieved by specifying meta-information
+        in the pom, using the following syntax for jar files :
+      </p>
+
+  <source><![CDATA[
+    <dependency>
+      <id>jarid</id>
+      <version>jarversion</version>
+      <properties>
+        <jnlp.jar>true</jnlp.jar>
+        <jnlp.main.jar>true</jnlp.main.jar>
+      </properties>
+    </dependency>
+  ]]></source>
+
+      <p>
+        If no jars contains this tag (jnlp.main.jar), it's the project jar which will be used.
+      </p>
+    </section>
   </body>
 </document>
