diff --git a/faq/plugin.jelly b/faq/plugin.jelly
index bedd4a13..0f3bb21e 100644
--- a/faq/plugin.jelly
+++ b/faq/plugin.jelly
@@ -69,14 +69,16 @@
           <x:set var="root" select="$doc/*"/>
 
           <!-- produce a output xdoc xml file from parsed .fml source -->
-          <j:file name="${outFile}" encoding="${outputencoding}" outputMode="xml">
+          <j:file name="${outFile}" encoding="${outputencoding}" outputMode="xml" escapeText="false">
   <document>
 
     <properties>
-      <title><x:expr select="$root/title"/></title>
+      <x:element name="title"><x:expr select="$root/@title"/></x:element>
     </properties>
     <body>
-      <section name="Frequently Asked Questions">
+      <x:element name="section">
+        <x:attribute name="name"><x:expr select="$root/@title"/></x:attribute>
+
         <x:forEach select="$root/part">
           <p>
             <strong><x:expr select="title"/></strong>
@@ -92,7 +94,7 @@
             </x:forEach>
           </ol>
         </x:forEach>
-      </section>
+      </x:element>
 
       <x:forEach select="$root/part">
         <x:element name="section">
diff --git a/faq/xdocs/index.xml b/faq/xdocs/index.xml
index 58c906b4..15e0a050 100644
--- a/faq/xdocs/index.xml
+++ b/faq/xdocs/index.xml
@@ -9,13 +9,13 @@
   <body>
     <section name="Maven FAQ Plug-in">
       <p>
-				This plugin generates xdoc documentation from an XML FAQ document.
+				This plugin generates xdoc documentation from XML FAQ documents.
 				This automates the creation of an index of questions with hypertext
 				links to the full question and answers.
       </p>
       <p>
-        The plugin uses by default a file called <code>xdocs/faq.fml</code>
-        to generate the FAQ entry. There is an example of the XML format 
+        The plugin uses the <code>xdocs</code> directory by default
+        to generate the FAQ files. There is an example of the XML format 
         <a href="faq.fml">here</a>.
       </p>
       <p>
@@ -26,9 +26,21 @@
       	To enable FAQ generation add the following to your maven.xml
       </p>
       <source>
-  &lt;preGoal name="xdoc:jelly-transform"&gt;
-    &lt;attainGoal name="faq"/&gt;
-  &lt;/preGoal&gt;      	
+  <![CDATA[
+  <preGoal name="xdoc:jelly-transform">
+    <attainGoal name="faq"/>
+  </preGoal>
+  ]]>
+      </source>
+      <p>
+        You can also add the faq generation to your project.xml likt this :
+      </p>
+      <source>
+  <![CDATA[
+  <reports>
+    <report>maven-faq-plugin</report>
+  <reports>
+  ]]>
       </source>
     </section>
  </body>
