diff --git a/faq/plugin.properties b/faq/plugin.properties
index f1a15f21..b17850f3 100644
--- a/faq/plugin.properties
+++ b/faq/plugin.properties
@@ -23,3 +23,6 @@ maven.faq.src=${maven.docs.src}
 
 # Destination directory where output xdocs file are produced
 maven.faq.dest=${maven.gen.docs}
+
+# Whether to generate links to the top of the page
+maven.faq.toplinks=true
diff --git a/faq/src/plugin-resources/faq.jsl b/faq/src/plugin-resources/faq.jsl
index 135dcbe9..d1624621 100644
--- a/faq/src/plugin-resources/faq.jsl
+++ b/faq/src/plugin-resources/faq.jsl
@@ -80,10 +80,13 @@
 
   <jsl:template match="answer">
     <dd>
+        <jsl:applyTemplates trim="true" />
+        <j:if test="${context.getVariable('maven.faq.toplinks') == 'true'}">
         <j:set var="top"><x:expr select="../../../@title"/></j:set>
         <j:set var="_top">#<doc:escapeNameToken value="${top}"/></j:set>
         <div class="xright"><a href="${_top}">[top]</a></div>
-        <jsl:applyTemplates trim="true" />
+        <br/>
+        </j:if>
     </dd>
   </jsl:template> 
 
diff --git a/faq/xdocs/changes.xml b/faq/xdocs/changes.xml
index 8ac08537..9fc33d71 100644
--- a/faq/xdocs/changes.xml
+++ b/faq/xdocs/changes.xml
@@ -23,6 +23,7 @@
   </properties>
   <body>
     <release version="1.5-SNAPSHOT" date="in SVN">
+      <action dev="aheritier" type="fix" issue="MPFAQ-19" due-to="Lukas Theussl">Optional toplinks and layout fix.</action>
       <action dev="aheritier" type="fix" issue="MPFAQ-16" due-to="Lukas Theussl">FAQ plugin does not produce valid XHTML 1.0 Transitional.</action>
       <action dev="aheritier" type="add" issue="MPFAQ-15" due-to="Lukas Theussl">Adding a "top" link beside each answer.</action>
       <action dev="dion" type="update" issue="MPFAQ-14" due-to="florent ramiere">Document .fml extension requirement</action>
diff --git a/faq/xdocs/properties.xml b/faq/xdocs/properties.xml
index 0d8ac8ea..c943b68a 100644
--- a/faq/xdocs/properties.xml
+++ b/faq/xdocs/properties.xml
@@ -44,6 +44,15 @@
             Defaults to the value of maven.gen.docs (which is ${maven.build.dir}/generated-xdocs).
           </td>
         </tr>
+        <tr>
+          <td>maven.faq.toplinks</td>
+          <td>Yes</td>
+          <td>
+            Specifies whether links to the top of the page should be
+            generated after each answer.
+            Defaults to <code>true</code>.
+          </td>
+        </tr>
       </table>
     </section>
   </body>
