diff --git a/jnlp/plugin.jelly b/jnlp/plugin.jelly
index a6b8306b..e5f77f85 100644
--- a/jnlp/plugin.jelly
+++ b/jnlp/plugin.jelly
@@ -128,6 +128,9 @@
                               <j:when test="${dep.getProperty('jnlp.main.jar')=='true'}">
                                 <j:set var="mainExists" value="true"/>
                                 <j:choose>
+                                  <j:when test="${(context.getVariable('maven.jnlp.jardiff') != null) and (dep.version.indexOf('SNAPSHOT') lt 0)}">
+                                       <jar href="${dep.artifactId}.jar" main="true" version="${depVer}"/>
+                                  </j:when>
                                   <j:when test="${(context.getVariable('maven.jnlp.usejarversions') != null) and (dep.version.indexOf('SNAPSHOT') lt 0)}">
                                        <jar href="${lib.file.name}" main="true" version="${depVer}"/>
                                   </j:when>
@@ -138,6 +141,9 @@
                               </j:when>
                               <j:otherwise>
                                 <j:choose>
+                                  <j:when test="${(context.getVariable('maven.jnlp.jardiff') != null) and (dep.version.indexOf('SNAPSHOT') lt 0)}">
+                                      <jar href="${dep.artifactId}.jar" version="${depVer}"/>
+                                  </j:when>
                                   <j:when test="${(context.getVariable('maven.jnlp.usejarversions') != null) and (dep.version.indexOf('SNAPSHOT') lt 0)}">
                                       <jar href="${lib.file.name}" version="${depVer}"/>
                                   </j:when>
@@ -159,6 +165,9 @@
                     <j:choose>
                         <j:when test="${mainExists=='false'}">
                             <j:choose>
+                              <j:when test="${(context.getVariable('maven.jnlp.jardiff') != null) and (pom.currentVersion.indexOf('SNAPSHOT') lt 0)}">
+                                <jar href="${pom.artifactId}.jar" main="true" version="${depVer}"/>
+                              </j:when>
                               <j:when test="${(context.getVariable('maven.jnlp.usejarversions') != null) and (pom.currentVersion.indexOf('SNAPSHOT') lt 0)}">
                                 <jar href="${final.jar.name}" main="true" version="${depVer}"/>
                               </j:when>
@@ -169,6 +178,9 @@
                         </j:when>
                         <j:otherwise>
                             <j:choose>
+                              <j:when test="${(context.getVariable('maven.jnlp.jardiff') != null) and (pom.currentVersion.indexOf('SNAPSHOT') lt 0)}">
+                                <jar href="${pom.artifactId}.jar" version="${depVer}"/>
+                              </j:when>
                               <j:when test="${(context.getVariable('maven.jnlp.usejarversions') != null) and (pom.currentVersion.indexOf('SNAPSHOT') lt 0)}">
                                 <jar href="${final.jar.name}" version="${depVer}"/>
                               </j:when>
@@ -299,20 +311,39 @@
             <ant:echo>Found a store...signing jars</ant:echo>
 
             <ant:echo>Signing jar files ...</ant:echo>
+            <j:choose>
+                <j:when test="${(context.getVariable('maven.jnlp.jardiff') != null) and (pom.currentVersion.indexOf('SNAPSHOT') lt 0)}">
+                    <j:set var="maven.final.signedname" value="${pom.artifactId}__V${pom.currentVersion}.jar"/>
+                </j:when>
+                <j:otherwise>
+                    <ant:echo>Not Using JarDiff ...</ant:echo>
+                    <j:set var="maven.final.signedname" value="${maven.final.name}.jar"/>
+                </j:otherwise>
+            </j:choose>
             <ant:signjar
                 jar="${maven.jnlp.tmpdir}/${maven.final.name}.jar"
-                signedjar="${maven.jnlp.dir}/${maven.final.name}.jar"
+                signedjar="${maven.jnlp.dir}/${maven.final.signedname}"
                 alias="${maven.jnlp.signjar.alias}"
+                storetype="${maven.jnlp.signjar.storetype}"
                 storepass="${maven.jnlp.signjar.storepass}"
                 keystore="${maven.jnlp.signjar.store}"/>
 
             <j:forEach var="lib" items="${pom.artifacts}">
               <j:set var="dep" value="${lib.dependency}"/>
               <j:if test="${dep.getProperty('jnlp.jar')=='true'}">
+                <j:choose>
+                    <j:when test="${(context.getVariable('maven.jnlp.jardiff') != null) and (dep.version.indexOf('SNAPSHOT') lt 0)}">
+                        <j:set var="lib.file.signedname" value="${dep.artifactId}__V${dep.version}.jar"/>
+                    </j:when>
+                    <j:otherwise>
+                        <j:set var="lib.file.signedname" value="${lib.final.name}.jar"/>
+                    </j:otherwise>
+                </j:choose>
                 <ant:signjar
                   jar="${maven.jnlp.tmpdir}/${lib.file.name}"
-                  signedjar="${maven.jnlp.dir}/${lib.file.name}"
+                  signedjar="${maven.jnlp.dir}/${lib.file.signedname}"
                   alias="${maven.jnlp.signjar.alias}"
+                  storetype="${maven.jnlp.signjar.storetype}"
                   storepass="${maven.jnlp.signjar.storepass}"
                   keystore="${maven.jnlp.signjar.store}"/>
               </j:if>
@@ -321,6 +352,7 @@
                   jar="${maven.jnlp.tmpdir}/${lib.file.name}"
                   signedjar="${maven.jnlp.dir}/${lib.file.name}"
                   alias="${maven.jnlp.signjar.alias}"
+                  storetype="${maven.jnlp.signjar.storetype}"
                   storepass="${maven.jnlp.signjar.storepass}"
                   keystore="${maven.jnlp.signjar.store}"/>
               </j:if>
@@ -359,6 +391,7 @@
         <ant:genkey alias="${maven.jnlp.signjar.alias}"
                    storepass="${maven.jnlp.signjar.storepass}"
                    keystore="${maven.jnlp.signjar.store}"
+                   storetype="${maven.jnlp.signjar.storetype}"
                    validity="${maven.jnlp.signjar.validity}" >
             <ant:dname>
                 <j:if test="${context.getVariable('maven.jnlp.signjar.dname.cn') != null}">
diff --git a/jnlp/plugin.properties b/jnlp/plugin.properties
index 09b904a5..063218b9 100644
--- a/jnlp/plugin.properties
+++ b/jnlp/plugin.properties
@@ -30,6 +30,7 @@ maven.jnlp.homepage=index.html
 ## maven.jnlp.description.short=${pom.shortDescription}
 ##maven.jnlp.offline.allowed=true
 ##maven.jnlp.permission=all or j2ee
+##maven.jnlp.jardiff=true
 
 maven.jnlp.j2se.version=1.4
 maven.jnlp.j2se.heapsize.initial=32m
@@ -44,7 +45,7 @@ maven.jnlp.j2se.heapsize.max=128m
 ##maven.jnlp.signjar.store
 ##maven.jnlp.signjar.storepass
 ## maven.jnlp.signjar.alias=${pom.artifactId}
-
+maven.jnlp.signjar.storetype=jks
 maven.jnlp.signjar.validity=720
 ##maven.jnlp.signjar.dname.cn //Common name
 ##maven.jnlp.signjar.dname.ou //Organization unit
diff --git a/jnlp/project.xml b/jnlp/project.xml
index c2a3cb4e..1c6ca61a 100644
--- a/jnlp/project.xml
+++ b/jnlp/project.xml
@@ -23,7 +23,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-jnlp-plugin</id>
   <name>Maven JNLP Plug-in</name>
-  <currentVersion>1.3</currentVersion>
+  <currentVersion>1.4-SNAPSHOT</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
index a5fc28bf..e6e89fc7 100644
--- a/jnlp/xdocs/changes.xml
+++ b/jnlp/xdocs/changes.xml
@@ -25,6 +25,10 @@
     <author email="evenisse@ifrance.com">Emmanuel Venisse</author>
   </properties>
   <body>
+    <release version="1.4" date="In CVS">
+      <action dev="evenisse" type="add" due-to="Pelle Braendgaard" issue="MPJNLP-8">Added Support for JarDiff.</action>
+      <action dev="evenisse" type="add">Added maven.jnlp.signjar.storetype property.</action>
+    </release>
     <release version="1.3" date="2004-03-10">
       <action dev="evenisse" type="add" issue="MPJNLP-7">Added extra property maven.jnlp.cert.version to support certificate renewals.</action>
       <action dev="evenisse" type="fix" issue="MPJNLP-6">Updated jarversions support to take SNAPSHOT jars into account.</action>
diff --git a/jnlp/xdocs/properties.xml b/jnlp/xdocs/properties.xml
index 36ba06a0..4b0d20af 100644
--- a/jnlp/xdocs/properties.xml
+++ b/jnlp/xdocs/properties.xml
@@ -289,6 +289,14 @@
           </td>
           <td>false</td>
         </tr>
+        <tr>
+          <td>maven.jnlp.jardiff</td>
+          <td>Yes</td>
+          <td>
+            Use the jar diff option for the Sun's JNLP Download Servlet.
+          </td>
+          <td>false</td>
+        </tr>
       </table>
     </section>
     <section name="Keystore settings">
@@ -310,6 +318,14 @@
           </td>
           <td></td>
         </tr>
+        <tr>
+          <td>maven.jnlp.signjar.storetype</td>
+          <td>Yes</td>
+          <td>
+            The keystore type.
+          </td>
+          <td>jks</td>
+        </tr>
         <tr>
           <td>maven.jnlp.signjar.alias</td>
           <td>Yes</td>