diff --git a/jnlp/plugin.jelly b/jnlp/plugin.jelly
index e5f77f85..98f57781 100644
--- a/jnlp/plugin.jelly
+++ b/jnlp/plugin.jelly
@@ -41,9 +41,15 @@
         description="Generate JNLP file and sign all jars"
         prereqs="jnlp:generate-jnlp"/>
 
+    <goal name="jnlp:init"
+          description="Initialize jnlp plugin"
+        <maven:property name="maven.jnlp.signjar.alias" defaultValue="${pom.artifactId}"/>
+        <maven:property name="maven.jnlp.signjar.dname.o" defaultValue="${pom.organization.name}"/>
+    </goal>
+
     <goal name="jnlp:generate-jnlp"
              description="Generate the .jnlp file and sign all jars"
-             prereqs="jar:jar">
+             prereqs="jar:jar, jnlp:init">
 
         <ant:mkdir dir="${maven.jnlp.dir}"/>
         <ant:echo>Creating ${maven.jnlp.dir}/${pom.artifactId}.jnlp ...</ant:echo>
@@ -54,8 +60,6 @@
         <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"/>
         
@@ -385,8 +389,9 @@
     <!-- Generate keystore file for signing jar files                       -->
     <!-- ================================================================== -->
     <goal name="jnlp:generate-keystore"
-             description="Generate a keystore file">
-        
+             description="Generate a keystore file"
+             prereqs="jnlp:init">
+
         <ant:delete file="${maven.jnlp.signjar.store}"/>
         <ant:genkey alias="${maven.jnlp.signjar.alias}"
                    storepass="${maven.jnlp.signjar.storepass}"
diff --git a/jnlp/xdocs/changes.xml b/jnlp/xdocs/changes.xml
index e6e89fc7..e20e4e08 100644
--- a/jnlp/xdocs/changes.xml
+++ b/jnlp/xdocs/changes.xml
@@ -26,6 +26,7 @@
   </properties>
   <body>
     <release version="1.4" date="In CVS">
+      <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>
     </release>