diff --git a/multiproject/plugin.jelly b/multiproject/plugin.jelly
index 574a945f..24c05d23 100644
--- a/multiproject/plugin.jelly
+++ b/multiproject/plugin.jelly
@@ -186,13 +186,12 @@
     <j:if test="${overviewPageCreate=='true'}">      
       <ant:echo>Creating overview page</ant:echo>
       <j:set var="encoding" value="${maven.docs.outputencoding}"/>
-      <velocity:merge 
-        name="${maven.gen.docs}/${overviewPageLink}.xml"
-        basedir="${maven.multiproject.templates}"
-        template="projects-overview.xml"
-        inputEncoding="${encoding}"
-        outputEncoding="${encoding}" 
-        />
+        <doc:jslFile
+            output="${maven.gen.docs}/${overviewPageLink}.xml"
+            stylesheet="${plugin.resources}/templates/projects-overview.jelly"
+            encoding="${encoding}"
+            outputMode="xml"
+            prettyPrint="true"/>
     </j:if>
  
   </goal>
diff --git a/multiproject/src/plugin-resources/templates/projects-overview.jelly b/multiproject/src/plugin-resources/templates/projects-overview.jelly
new file mode 100644
index 00000000..be31fb3a
--- /dev/null
+++ b/multiproject/src/plugin-resources/templates/projects-overview.jelly
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+ * ========================================================================
+ * 
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * ========================================================================
+-->
+
+<project
+  xmlns:j="jelly:core"
+  xmlns:maven="jelly:maven"
+  xmlns:util="jelly:util"
+  xmlns:x="jelly:xml">
+
+  <document>
+
+    <properties>
+      <title>${overviewPageTitle}</title>
+    </properties>
+
+    <body>
+      <section name="${overviewPageTitle}">
+        <p>
+          <j:if test="${!empty(overviewPageText)}">
+            ${overviewPageText}
+          </j:if>
+        </p>
+
+        <table>
+          <j:forEach var="project" items="${multiprojects}">
+            <tr>
+              <j:choose>
+                <j:when test="${navType == 'aggregate'}">
+                  <th><a href="${aggregateDir}${project.artifactId}/index.html">${project.name}</a></th>
+                </j:when>
+                <j:otherwise>
+                  <th><a href="${project.url}">${project.name}</a></th>
+                </j:otherwise>
+              </j:choose>
+              <td>${project.shortDescription}</td>
+            </tr>
+          </j:forEach>
+        </table>
+
+      </section>
+    </body>
+
+  </document>
+</project>
diff --git a/multiproject/src/plugin-resources/templates/projects-overview.xml b/multiproject/src/plugin-resources/templates/projects-overview.xml
deleted file mode 100644
index 4663dc59..00000000
--- a/multiproject/src/plugin-resources/templates/projects-overview.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="$encoding"?>
-<!-- 
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<document>
-  <properties>
-    <title>$overviewPageTitle</title>
-  </properties>  
-  <body> 
-    <section name="$overviewPageTitle">
-      <p>
-        #if ($overviewPageText && $overviewPageText.length() > 0)
-        ${overviewPageText}
-        <br/>
-        #end
-      </p>
-      <table>          
-        #foreach ($project in $multiprojects)
-        <tr>
-          #if ($navType == "aggregate")
-          <th><a href="${aggregateDir}${project.artifactId}/index.html">${project.name}</a></th>
-          #else
-          <th><a href="${project.url}">${project.name}</a></th>
-          #end        
-          <td>${project.shortDescription}</td>
-        </tr>  
-        #end  
-      </table> 
-    </section>  
-  </body>
-</document>
\ No newline at end of file
diff --git a/multiproject/xdocs/changes.xml b/multiproject/xdocs/changes.xml
index 1a8988ac..5800bd94 100644
--- a/multiproject/xdocs/changes.xml
+++ b/multiproject/xdocs/changes.xml
@@ -26,7 +26,8 @@
   </properties>
   <body>
     <release version="1.5-SNAPSHOT" date="in SVN">
-      <action dev="ltheussl" type="fix" issue="MPMULTIPROJECT-49">Can not mix multiproject goals with other/custom goals</action>
+      <action dev="ltheussl" type="fix" issue="MPMULTIPROJECT-44">multiproject:site fails if sub-projects has a &amp;amp; on POM.</action>
+      <action dev="ltheussl" type="fix" issue="MPMULTIPROJECT-49">Can not mix multiproject goals with other/custom goals.</action>
     </release>
     <release version="1.4.1" date="2005-06-07">
       <action dev="vmassol" type="fix">Set version of the
