diff --git a/idea/src/plugin-resources/templates/v4/module.jelly b/idea/src/plugin-resources/templates/v4/module.jelly
index cc961ff0..a0eefa45 100644
--- a/idea/src/plugin-resources/templates/v4/module.jelly
+++ b/idea/src/plugin-resources/templates/v4/module.jelly
@@ -38,8 +38,8 @@
         <setting name="JAR_ENABLED" value="true" />
       </component>
       <component name="EjbModuleProperties">
-        <!-- MPIDEA-15 -->
-        <deploymentDescriptor name="ejb-jar.xml" url="file://$$MODULE_DIR$$/src/ejb/META-INF/ejb-jar.xml" version="2.x" />
+        <maven:makeRelativePath var="value" basedir="${basedir}" path="${maven.ejb.src}" separator="/" />
+        <deploymentDescriptor name="ejb-jar.xml" url="file://$$MODULE_DIR$$/${value}/META-INF/ejb-jar.xml" version="2.x" />
 
         <orderEntriesWatcher>
           <pairs>
@@ -174,7 +174,6 @@
       <orderEntry type="sourceFolder" forTests="false"/>
       <j:forEach var="lib" items="${pom.artifacts}">
         <j:set var="dep" value="${lib.dependency}"/>
-          <!-- MPIDEA-27: Depdencies of wars en ejb's should also be reffed -->
           
           <j:choose>
             <j:when test="${dep.groupId == pom.groupId}" >
@@ -194,7 +193,6 @@
               </orderEntry>
             </j:otherwise>
           </j:choose>
-          <!-- MPIDEA-27: Depdencies of wars en ejb's should also be reffed -->
 
       </j:forEach>
     </component>
diff --git a/idea/xdocs/changes.xml b/idea/xdocs/changes.xml
index d0cd55f1..3eda9948 100644
--- a/idea/xdocs/changes.xml
+++ b/idea/xdocs/changes.xml
@@ -25,6 +25,7 @@
   </properties>
   <body>
     <release version="1.6-SNAPSHOT" date="in SVN">
+      <action dev="brett" type="fix" 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>
