diff --git a/xdoc/src/plugin-resources/site.jsl b/xdoc/src/plugin-resources/site.jsl
index 907d91de..61a49c80 100644
--- a/xdoc/src/plugin-resources/site.jsl
+++ b/xdoc/src/plugin-resources/site.jsl
@@ -976,7 +976,9 @@
   <jsl:template match="text()"><x:expr select="."/></jsl:template>
 
   <!-- copy any other elements through -->
-  <jsl:template match="*" trim="false"><jsl:copy trim="false"><jsl:applyTemplates trim="false"/></jsl:copy></jsl:template>
+  <!-- This does not work with entities, see http://jira.codehaus.org/browse/MPXDOC-17 -->
+  <!--<jsl:template match="*" trim="false"><jsl:copy trim="false"><jsl:applyTemplates trim="false"/></jsl:copy></jsl:template>-->
+  <jsl:template match="*" trim="false"><jsl:copyOf select="."/></jsl:template>
    
   <!-- process a message -->
   <!-- Key is more important than message... -->
diff --git a/xdoc/src/plugin-test/test01/common/links.xml b/xdoc/src/plugin-test/test01/common/links.xml
index 1d0248e3..06d3571f 100644
--- a/xdoc/src/plugin-test/test01/common/links.xml
+++ b/xdoc/src/plugin-test/test01/common/links.xml
@@ -77,5 +77,11 @@
 <!ENTITY _set-parent '<code>&lt;set-parent&gt;</code>'>
 <!ENTITY set-parent '<a href="rules.html#set-parent">&_set-parent;</a>'>
 
+<!ENTITY apache.a 'Apache'>
+<!ENTITY apache.b '&lt;Apache&gt;'>
+<!ENTITY apache.c '[Apache]'>
+<!ENTITY apache.d '&lt;a href=&quot;http://www.apache.org/&quot;&gt;&apache.b;&lt;/a&gt;'>
+<!ENTITY apache.e '<a href="http://www.apache.org/">&apache.b;</a>'>
+<!ENTITY apache.f '<em>&apache.a;</em>'>
 
 
diff --git a/xdoc/src/plugin-test/test01/xdocs-replacement/test.xml b/xdoc/src/plugin-test/test01/xdocs-replacement/test.xml
index a9d390f1..f0b81aea 100644
--- a/xdoc/src/plugin-test/test01/xdocs-replacement/test.xml
+++ b/xdoc/src/plugin-test/test01/xdocs-replacement/test.xml
@@ -19,7 +19,7 @@
 
 <!-- $Id$ -->
 <!DOCTYPE document [
-	<!ENTITY % common-links SYSTEM "../common/links.xml">
+	<!ENTITY % common-links SYSTEM "common/links.xml">
 	%common-links;
 ]>
 <document>
@@ -30,10 +30,58 @@
   </properties>
 
   <body>
-    <section name="test1">
-      &_module;
+    <section name="MPXDOC-17">
+      <table>
+        <tr>
+          <th>Entity</th>
+          <th>Expected result</th>
+          <th>Actual result</th>
+        </tr>
+        <tr>
+          <td>_module</td>
+          <td><code>&lt;module&gt;</code></td>
+          <td>&_module;</td>
+        </tr>
+        <tr>
+          <td>module</td>
+          <td><a href="descriptor.html#module">module</a></td>
+          <td>&module;</td>
+        </tr>
+        <tr>
+          <td>apache.a</td>
+          <td>Apache</td>
+          <td>&apache.a;</td>
+        </tr>
+        <tr>
+          <td>apache.b</td>
+          <td>&lt;Apache&gt;</td>
+          <td>&apache.b;</td>
+        </tr>
+        <tr>
+          <td>apache.c</td>
+          <td>[Apache]</td>
+          <td>&apache.c;</td>
+        </tr>
+        <tr>
+          <td>apache.d</td>
+          <td>
+            &lt;a href=&quot;http://www.apache.org/&quot;&gt;&apache.b;&lt;/a&gt;
+          </td>
+          <td>&apache.d;</td>
+        </tr>
+        <tr>
+          <td>apache.e</td>
+          <td><a href="http://www.apache.org/">&apache.b;</a></td>
+          <td>&apache.e;</td>
+        </tr>
+        <tr>
+          <td>apache.f</td>
+          <td><em>&apache.a;</em></td>
+          <td>&apache.f;</td>
+        </tr>
+      </table>
 
-      <p><a href="#Section 2">blah</a></p>
+      <p><a href="#Section_2">blah</a></p>
     </section>
     <section name="Section 2">
       <p><a href="/servlet/x?param=1&amp;q=foo">foo -&gt; bar</a></p>
diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml
index 660262ca..084c8998 100644
--- a/xdoc/xdocs/changes.xml
+++ b/xdoc/xdocs/changes.xml
@@ -27,6 +27,7 @@
   </properties>
   <body>
     <release version="1.10-SNAPSHOT" date="in SVN">
+      <action dev="ltheussl" type="fix" issue="MPXDOC-17">Fix xml entities in xdoc source files (only in Maven 1.1 because of a  bug in an old Jelly version).</action>
       <action dev="ltheussl" type="fix" issue="MPXDOC-194">Add i18n support for links and breadcrumbs.</action>
       <action dev="aheritier" type="update" issue="MAVEN-1753">Replace the deprecated xmlParserAPIs by xml-apis 1.3.03.</action>
       <action dev="ltheussl" type="add" issue="MPXDOC-192">Add a public DTD identifier for xdoc.</action>

Entity	Expected result	Actual result
_module	`<module>`	&_module;
module	module	&module;
apache.a	Apache	&apache.a;
apache.b	<Apache>	&apache.b;
apache.c	[Apache]	&apache.c;
apache.d	+ <a href="http://www.apache.org/">&apache.b;</a> +	&apache.d;
apache.e	&apache.b;	&apache.e;
apache.f	&apache.a;	&apache.f;