diff --git a/idea/plugin.properties b/idea/plugin.properties
index dac44e0a..cf229fa5 100644
--- a/idea/plugin.properties
+++ b/idea/plugin.properties
@@ -17,3 +17,6 @@
 # Project version - valid values are 3, 4
 maven.idea.project.version=4
 maven.idea.target.exclude=true
+
+# JDK version
+maven.idea.jdk=java version "${java.version}"
diff --git a/idea/src/plugin-resources/templates/v4/module.jelly b/idea/src/plugin-resources/templates/v4/module.jelly
index 07186de5..4234136f 100644
--- a/idea/src/plugin-resources/templates/v4/module.jelly
+++ b/idea/src/plugin-resources/templates/v4/module.jelly
@@ -143,7 +143,7 @@
         <excludeFolder url="file://$$MODULE_DIR$$/${defaulttargetdir}/classes"/>
         <excludeFolder url="file://$$MODULE_DIR$$/${defaulttargetdir}/test-classes"/>
       </content>
-      <orderEntry type="jdk" jdkName="java version &quot;${java.version}&quot;"/>
+      <orderEntry type="jdk" jdkName="${maven.idea.jdk}"/>
         <!-- MPIDEA-11 (duplicates MPIDEA-22): Reference resources directory -->
         <j:forEach var="res" items="${pom.build.resources}">
             <orderEntry type="module-library">
diff --git a/idea/xdocs/changes.xml b/idea/xdocs/changes.xml
index db64b142..440eba10 100644
--- a/idea/xdocs/changes.xml
+++ b/idea/xdocs/changes.xml
@@ -25,10 +25,11 @@
   </properties>
   <body>
     <release version="1.6-SNAPSHOT" date="in SVN">
-      <action dev="brett" type="fix" issue="MPIDEA-7" due-to="David Jencks">Make projects within the reactor set IDEA module dependencies, but keep all others as JAR dependencies</action>
-      <action dev="brett" type="fix" issue="MPIDEA-10" due-to="David Jencks">Add a property for specifying generated source directories to include in the module</action>
-      <action dev="brett" type="fix" issue="MPIDEA-19">Set source level properties based on the compile source level</action>
-      <action dev="brett" type="fix" issue="MPIDEA-9" due-to="Eirik Bjorsnos">Deployment descriptor for ejb.jar hard-coded</action>
+      <action dev="brett" type="update" issue="MPIDEA-7" due-to="David Jencks">Make projects within the reactor set IDEA module dependencies, but keep all others as JAR dependencies</action>
+      <action dev="brett" type="add" issue="MPIDEA-10" due-to="David Jencks">Add a property for specifying generated source directories to include in the module</action>
+      <action dev="brett" type="update" issue="MPIDEA-19">Set source level properties based on the compile source level</action>
+      <action dev="brett" type="add" issue="MPIDEA-19" due-to="Jose Peleteiro">Add <code>maven.idea.jdk</code> property so that the JDK can be explicitly specified if it does not use the IDEA default</action>
+      <action dev="brett" type="update" issue="MPIDEA-9" due-to="Eirik Bjorsnos">Deployment descriptor for ejb.jar hard-coded</action>
       <action dev="brett" type="fix" issue="MPIDEA-15" due-to="Geoffrey De Smet">v4/module.jelly generates incorrect references to $MODULE_DIR$</action>
       <action dev="brett" type="add" issue="MPIDEA-28" due-to="Geoffrey De Smet">Generate a module for the multiproject itself</action>
       <action dev="brett" type="update" issue="MPIDEA-26" due-to="Geoffrey De Smet">idea:multiproject without idea:workspace so a local workspaces aren't lost</action>
diff --git a/idea/xdocs/properties.xml b/idea/xdocs/properties.xml
index 4ec15ac7..dcda3e09 100644
--- a/idea/xdocs/properties.xml
+++ b/idea/xdocs/properties.xml
@@ -98,6 +98,13 @@
              Default value is true.
           </td>
         </tr>        
+        <tr>
+          <td>maven.idea.jdk</td>
+          <td>Yes</td>
+          <td>
+            The target JDK module name. <code>java version "${java.version}"</code> is the default. (IDEA 4 only)
+          </td>
+        </tr>       
       </table> 
     </section>
   </body>
