diff --git a/jnlp/plugin.jelly b/jnlp/plugin.jelly
index f5d33b46..fa902059 100644
--- a/jnlp/plugin.jelly
+++ b/jnlp/plugin.jelly
@@ -198,7 +198,11 @@
 
                     <u:tokenize var="listOfProperties" delim=" ">${maven.jnlp.properties}</u:tokenize>
                     <j:forEach var="someProperty" items="${listOfProperties}">
-                      <property name="${someProperty}" value="${context.getVariable(someProperty)}"/>
+                      <u:tokenize var="nameAndValue" delim="=">${someProperty}</u:tokenize>
+                      <j:if test="${someProperty.indexOf('=') ge 0}">
+                        <u:tokenize var="nameAndValue" delim="=">${someProperty}</u:tokenize>
+                        <property name="${nameAndValue.get(0)}" value="${nameAndValue.get(1)}"/>
+                      </j:if>
                     </j:forEach>
                     
                 </resources>
diff --git a/jnlp/src/plugin-resources/jnlp.manifest b/jnlp/src/plugin-resources/jnlp.manifest
index 39cc9ae5..ae169151 100644
--- a/jnlp/src/plugin-resources/jnlp.manifest
+++ b/jnlp/src/plugin-resources/jnlp.manifest
@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
-Created-By: Apache Jakarta Maven
+Created-By: Apache Maven
 
diff --git a/jnlp/xdocs/changes.xml b/jnlp/xdocs/changes.xml
index e20e4e08..7a44da79 100644
--- a/jnlp/xdocs/changes.xml
+++ b/jnlp/xdocs/changes.xml
@@ -29,6 +29,8 @@
       <action dev="evenisse" type="fix" issue="MPJNLP-9">Initialize correctly jnlp:generate-keystore goal.</action>
       <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>
+      <action dev="mvdb" type="fix">Documented the maven.jnlp.properties and made it work correctly</action>
+      <action dev="mvdb" type="fix">Created By is now set to Apache Maven instead of Apache Jakarta Maven</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>
diff --git a/jnlp/xdocs/properties.xml b/jnlp/xdocs/properties.xml
index 4b0d20af..3ba6b37a 100644
--- a/jnlp/xdocs/properties.xml
+++ b/jnlp/xdocs/properties.xml
@@ -208,6 +208,17 @@
             128m
           </td>
         </tr>
+        <tr>
+          <td>maven.jnlp.properties</td>
+          <td>Yes</td>
+          <td>
+            The arguments passed to the jvm. The arguments are seperated by a
+            space. The argument itself is in the format name=value. This
+            mechanism doesn't allow for spaces in any of the arguments itself.
+          </td>
+          <td>
+          </td>
+        </tr>
         <tr>
           <td>maven.jnlp.isapplet</td>
           <td>Yes</td>