diff --git a/jnlp/plugin.jelly b/jnlp/plugin.jelly
index e76528e8..8b3e0c50 100644
--- a/jnlp/plugin.jelly
+++ b/jnlp/plugin.jelly
@@ -33,15 +33,17 @@
         <!-- ================== -->
         <!-- Generate JNLP file -->
         <!-- ================== -->
+		<maven:property name="maven.jnlp.description" defaultValue="${pom.description}"/>
+		<maven:property name="maven.jnlp.description.short" defaultValue="${pom.shortDescription}"/>
+		<maven:property name="maven.jnlp.http.codebase" defaultValue="${pom.url}"/>
+		<maven:property name="maven.jnlp.signjar.alias" defaultValue="${pom.artifactId}"/>
+		<maven:property name="maven.jnlp.signjar.dname.o" defaultValue="${pom.organization.name}"/>
+		<maven:property name="maven.jnlp.title" defaultValue="${pom.name}"/>
+		<j:set var="final.jar.name" value="${maven.final.name}.jar"/>
+        
         <j:file name="${maven.jnlp.dir}/${pom.artifactId}.jnlp" prettyPrint="true"
           xmlns="dummy">
 
-            <maven:property name="maven.jnlp.description" defaultValue="${pom.description}"/>
-            <maven:property name="maven.jnlp.description.short" defaultValue="${pom.shortDescription}"/>
-            <maven:property name="maven.jnlp.http.codebase" defaultValue="${pom.url}"/>
-            <maven:property name="maven.jnlp.signjar.alias" defaultValue="${pom.artifactId}"/>
-            <maven:property name="maven.jnlp.signjar.dname.o" defaultValue="${pom.organization.name}"/>
-            <maven:property name="maven.jnlp.title" defaultValue="${pom.name}"/>
 
             <jnlp spec="${maven.jnlp.spec}"
               codebase="${maven.jnlp.http.codebase}"
@@ -98,11 +100,25 @@
                         <j:if test="${dep.getProperty('jnlp.jar')=='true'}">
                             <j:choose>
                               <j:when test="${dep.getProperty('jnlp.main.jar')=='true'}">
-                                 <j:set var="mainExists" value="true"/>
+                                <j:set var="mainExists" value="true"/>
+								<j:choose>
+								  <j:when test="${context.getVariable('maven.jnlp.usejarversions') != null}">
+									<jar href="${lib.file.name}" main="true" version="${dep.version}"/>
+								  </j:when>
+								  <j:otherwise>
                                   <jar href="${lib.file.name}" main="true"/>
+								  </j:otherwise>
+								</j:choose>
                               </j:when>
                               <j:otherwise>
-                                  <jar href="${lib.file.name}"/>
+                                <j:choose>
+                              	  <j:when test="${context.getVariable('maven.jnlp.usejarversions') != null}">
+                                    <jar href="${lib.file.name}" version="${dep.version}"/>
+                                  </j:when>
+                                  <j:otherwise>
+                                    <jar href="${lib.file.name}" />
+                                  </j:otherwise>
+                                </j:choose>
                               </j:otherwise>
                             </j:choose>
                         </j:if>
@@ -112,10 +128,24 @@
                     </j:forEach>
                     <j:choose>
                         <j:when test="${mainExists=='false'}">
-                            <jar href="${maven.final.name}.jar" main="true"/>
+							<j:choose>
+							  <j:when test="${context.getVariable('maven.jnlp.usejarversions') != null}">
+								<jar href="${final.jar.name}" main="true" version="${pom.currentVersion}"/>
+							  </j:when>
+							  <j:otherwise>
+                                <jar href="${final.jar.name}" main="true"/>
+							  </j:otherwise>
+							</j:choose>
                         </j:when>
                         <j:otherwise>
-                            <jar href="${maven.final.name}.jar"/>
+							<j:choose>
+							  <j:when test="${context.getVariable('maven.jnlp.usejarversions') != null}">
+								<jar href="${final.jar.name}" version="${pom.currentVersion}"/>
+							  </j:when>
+							  <j:otherwise>
+                                <jar href="${final.jar.name}" />
+							  </j:otherwise>
+							</j:choose>
                         </j:otherwise>
                     </j:choose>
                     <!--  This is close to what it WILL look like, but for now it is the ugly ass thing below  it-->
@@ -153,6 +183,40 @@
             </jnlp>
         </j:file>
         
+        <j:if test="${context.getVariable('maven.jnlp.usejarversions') != null}">
+        
+			<ant:echo>Creating ${maven.jnlp.dir}/version.xml ...</ant:echo>
+	
+			<!-- ================== -->
+			<!-- Generate version.xml file -->
+			<!-- ================== -->
+			<j:file name="${maven.jnlp.dir}/version.xml" prettyPrint="true"
+			  xmlns="dummy">
+			   <jnlp-versions>  
+				<j:forEach var="lib" items="${pom.artifacts}">
+					<j:set var="dep" value="${lib.dependency}"/>
+					<j:if test="${dep.getProperty('jnlp.jar')=='true' || dep.getProperty('jnlp.native.jar')=='true'}">
+					  <resource>  
+					   <pattern>  
+						 <name>${lib.file.name}</name>  
+						 <version-id>${dep.version}</version-id>  
+					   </pattern>  
+					   <file>${lib.file.name}</file>  
+					  </resource>  
+					</j:if>
+				</j:forEach>
+					  <resource>  
+					   <pattern>  
+						 <name>${final.jar.name}</name>  
+						 <version-id>${pom.currentVersion}</version-id>  
+					   </pattern>  
+					   <file>${final.jar.name}</file>  
+					  </resource>  
+			   </jnlp-versions>
+			</j:file>
+		</j:if>
+        
+        
         <!-- =========================== -->
         <!-- Copy jars in jnlp directory -->
         <!-- =========================== -->
diff --git a/jnlp/xdocs/changes.xml b/jnlp/xdocs/changes.xml
index b886f119..9b0e9cdd 100644
--- a/jnlp/xdocs/changes.xml
+++ b/jnlp/xdocs/changes.xml
@@ -8,6 +8,9 @@
 
   <body>
     <release version="1.3" date="In CVS">
+      <action dev="evenisse" type="fix">
+        MPJNLP-4. Add support for jar versions
+      </action>
       <action dev="jvanzyl" type="update">
         Remove the need for ${pom} interpolation in properties. The
         use of the maven:property tag is now used to glean a default property.