diff --git a/faq/project.xml b/faq/project.xml
index 1d2e3833..30641ade 100644
--- a/faq/project.xml
+++ b/faq/project.xml
@@ -22,7 +22,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-faq-plugin</id>
   <name>Maven FAQ Plugin</name>
-  <currentVersion>1.6</currentVersion>
+  <currentVersion>1.6.1-SNAPSHOT</currentVersion>
   <gumpRepositoryId>jakarta</gumpRepositoryId>
   <description>Creates XDoc documentation from an FAQ XML document.</description>
   <shortDescription>FAQ Plugin</shortDescription>
diff --git a/faq/src/plugin-resources/faq.jsl b/faq/src/plugin-resources/faq.jsl
index 68250129..d7215b5e 100644
--- a/faq/src/plugin-resources/faq.jsl
+++ b/faq/src/plugin-resources/faq.jsl
@@ -41,12 +41,12 @@
               <strong><x:expr select="title"/></strong>
             </p>
             <ol>
-              <x:forEach select="faq">
+              <x:forEach var="entry" select="faq">
               <li>
-                <j:set var="_id"><x:expr select="@id"/></j:set>
+                <j:set var="_id"><x:expr select="$entry/@id"/></j:set>
                 <j:set var="_id">#<doc:escapeNameToken value="${_id}"/></j:set>
                 <a href="${_id}">
-                  <x:copyOf select="question/node()"/>
+                  <x:copyOf select="$entry/question/node()"/>
                 </a>
               </li>
               </x:forEach>
diff --git a/faq/xdocs/changes.xml b/faq/xdocs/changes.xml
index dab332c8..519eb3e4 100644
--- a/faq/xdocs/changes.xml
+++ b/faq/xdocs/changes.xml
@@ -23,6 +23,9 @@
     <author email="dion@apache.org">dIon Gillard</author>
   </properties>
   <body>
+    <release version="1.6.1-SNAPSHOT" date="in SVN">
+      <action dev="ltheussl" type="fix" issue="MPFAQ-20">Make it work with upgraded dependencies for Maven-1.1-beta-3.</action>
+    </release>
     <release version="1.6" date="2006-01-07">
       <action dev="ltheussl" type="update">Remove maven-xdoc-plugin v1.9.2 requirement.</action>
       <action dev="ltheussl" type="update">Deprecated
