diff --git a/faq/src/plugin-resources/faq.jsl b/faq/src/plugin-resources/faq.jsl
index fe90a413..135dcbe9 100644
--- a/faq/src/plugin-resources/faq.jsl
+++ b/faq/src/plugin-resources/faq.jsl
@@ -3,7 +3,7 @@
 <!--
  * ========================================================================
  *
- * Copyright 2004 The Apache Software Foundation.
+ * 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.
@@ -52,7 +52,6 @@
             </ol>
           </x:forEach>
         </section>
-
         <jsl:applyTemplates trim="true" />
       </body>
     </document>
@@ -81,7 +80,10 @@
 
   <jsl:template match="answer">
     <dd>
-      <jsl:applyTemplates trim="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" />
     </dd>
   </jsl:template> 
 
diff --git a/faq/xdocs/changes.xml b/faq/xdocs/changes.xml
index 9fe36a59..27ac8cc3 100644
--- a/faq/xdocs/changes.xml
+++ b/faq/xdocs/changes.xml
@@ -24,6 +24,7 @@
   <body>
     <release version="1.4.1-SNAPSHOT" date="in SVN">
       <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>
       <action dev="aheritier" type="fix" issue="MPFAQ-11" due-to="Lukas Theussl">Questions' font is same size or smaller than answers' one. Xdoc plugin &lt; 1.9.2 required.</action>
       <action dev="aheritier" type="fix">The question is like a link because the anchor shouldn't enclose the question.</action>
