diff --git a/faq/plugin.jelly b/faq/plugin.jelly
index b656b213..b54fd9ef 100644
--- a/faq/plugin.jelly
+++ b/faq/plugin.jelly
@@ -105,7 +105,8 @@
             <x:forEach select="faq">
             <li>
               <x:element name="a">
-                <x:attribute name="href">#<x:expr select="@id"/></x:attribute>
+                <j:set var="_id"><x:expr select="@id"/></j:set>
+                <x:attribute name="href">#<doc:escapeNameToken value="${_id}"/></x:attribute>
                 <x:copyOf select="question/node()"/>
               </x:element>
             </li>
@@ -122,7 +123,8 @@
             <dl>
               <dt>
                 <x:element name="a">
-                  <x:attribute name="name"><x:expr select="@id"/></x:attribute>
+                  <j:set var="_id"><x:expr select="@id"/></j:set>
+                  <x:attribute name="name"><doc:escapeNameToken value="${_id}"/></x:attribute>
                   <x:copyOf select="question/node()"/>
                 </x:element>
               </dt>
diff --git a/faq/xdocs/changes.xml b/faq/xdocs/changes.xml
index feef3b9c..3515aa26 100644
--- a/faq/xdocs/changes.xml
+++ b/faq/xdocs/changes.xml
@@ -24,6 +24,10 @@
     <author email="dion@apache.org">dIon Gillard</author>
   </properties>
   <body>
+    <release version="1.3-SNAPSHOT" date="in CVS">
+      <action dev="brett" type="fix" issue="MPFAQ-8">Escape anchor tags and references so spaces can be used in id</action>
+    </release>
+
     <release version="1.2" date="2004-03-10">
       <action dev="epugh" type="fix">Only run when an xdocs directory exists.</action>
       <action dev="dion" type="fix">Fix MAVEN-973. xdocs source hardcoded.</action>
