diff --git a/src/documentation/sitemap.xmap b/src/documentation/sitemap.xmap
index 87d46f7..fc19f53 100644
--- a/src/documentation/sitemap.xmap
+++ b/src/documentation/sitemap.xmap
@@ -18,9 +18,9 @@
       </map:transformer>
 
       <map:transformer name="linkrewriter" logger="sitemap.transformer.linkrewriter" src="org.apache.cocoon.transformation.LinkRewriterTransformer">
-        <input-module name="linkmap">
-          <file src="{src}" reloadable="false" />
-        </input-module>
+        <link-attrs>href src</link-attrs>
+        <schemes>site ext</schemes>
+
         <input-module name="site">
           <input-module name="linkmap">
             <file src="{src}" reloadable="false" />
@@ -28,6 +28,13 @@
           <prefix>/site//</prefix>
           <suffix>/@href</suffix>
         </input-module>
+        <input-module name="ext">
+          <input-module name="linkmap">
+            <file src="{src}" reloadable="false" />
+          </input-module>
+          <prefix>/site/external-refs//</prefix>
+          <suffix>/@href</suffix>
+        </input-module>
       </map:transformer>
 
       <map:transformer name="xpath" logger="sitemap.transformer.xpath" src="org.apache.cocoon.transformation.XPathTransformer" />
@@ -41,9 +48,6 @@
       </map:transformer>
 
       <map:transformer name="xinclude" src="org.apache.cocoon.transformation.XIncludeTransformer" logger="sitemap.transformer.xinclude" pool-grow="2" pool-max="16" pool-min="2" />
-      <map:transformer logger="sitemap.transformer.lexer" name="lexer" src="org.apache.cocoon.transformation.LexicalTransformer"/>
-      <map:transformer logger="sitemap.transformer.lexer" name="parser" src="org.apache.cocoon.transformation.ParserTransformer"/>
-      <map:transformer logger="sitemap.transformer.lexer" name="pattern" src="org.apache.cocoon.transformation.PatternTransformer"/>
     </map:transformers>
 
     <map:readers default="resource">
@@ -77,9 +81,9 @@
       <map:matcher name="regexp" src="org.apache.cocoon.matching.RegexpURIMatcher"/>
     </map:matchers>
 
-    <map:actions>
-      <map:action logger="sitemap.action.resource-exists" name="resource-exists" src="org.apache.cocoon.acting.ResourceExistsAction"/>
-    </map:actions>
+    <map:selectors>
+      <map:selector logger="sitemap.selector.exists" name="exists" src="org.apache.cocoon.selection.ResourceExistsSelector" />
+    </map:selectors>
 
     <map:pipes default="caching">
       <map:pipe name="caching" src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"/>
@@ -94,7 +98,9 @@
   <map:views>
 
     <map:view name="links" from-position="last">
-      <map:transform src="resources/stylesheets/filterlinks.xsl"/>
+      <map:transform src="resources/stylesheets/filterlinks.xsl">
+        <map:parameter name="ctxbasedir" value="{realpath:.}/"/>
+      </map:transform>
       <map:serialize type="links"/>
     </map:view>
   </map:views>
@@ -107,6 +113,7 @@
         <map:parameter name="isfaq" value="{notoc}"/>
         <map:parameter name="nopdf" value="{nopdf}"/>
         <map:parameter name="path" value="{path}"/>
+        <map:parameter name="obfuscate-mail-links" value="false"/>
         <!-- Can set an alternative project skinconfig here 
         <map:parameter name="config-file" value="../../../../skinconf.xml"/>
         -->
@@ -123,7 +130,7 @@
     <map:pipeline internal-only="false">
 
 <!-- xml-commons start -->
-<!-- 2003-03-29 Copied default Forrest src/resources/conf/sitemap.xmap
+<!-- 2003-07-05 Copied default Forrest src/resources/conf/sitemap.xmap
      and added this match -->
   <map:match pattern="**/resolver-*.html">
     <map:generate src="content/xdocs/{1}/resolver-{2}.xml"/>
@@ -133,23 +140,144 @@
   </map:match>
 <!-- xml-commons end -->
 
+      <!-- ============================================================ -->
+      <!-- SOURCE FORMATS                                               -->
+      <!--                 Raw XML sources, typically doc-v11 format    -->
+      <!-- ============================================================ -->
+
+      <map:match pattern="changes.xml">
+        <map:mount uri-prefix="" src="status.xmap" check-reload="yes" />
+      </map:match>
+
+      <map:match pattern="todo.xml">
+        <map:mount uri-prefix="" src="status.xmap" check-reload="yes" />
+      </map:match>
+
+      <map:match pattern="**dtdx.xml">
+        <map:mount uri-prefix="" src="dtd.xmap" check-reload="yes" />
+      </map:match>
+
+      <map:match pattern="**linkmap*">
+        <map:mount uri-prefix="" src="linkmap.xmap" check-reload="yes" />
+      </map:match>
+
+      <map:match pattern="**menulinks*">
+        <map:mount uri-prefix="" src="linkmap.xmap" check-reload="yes" />
+      </map:match>
+
+      <map:match pattern="**issues.xml">
+        <map:mount uri-prefix="" src="issues.xmap" check-reload="yes" />
+      </map:match>
+
+      <map:match pattern="**faq.xml">
+        <map:mount uri-prefix="" src="faq.xmap" check-reload="yes" />
+      </map:match>
+
+      <map:match pattern="community/**index.xml">
+        <map:mount uri-prefix="" src="forrest.xmap" check-reload="yes" />
+      </map:match>
+
+      <map:match pattern="community/*/**.xml">
+        <map:mount uri-prefix="" src="revisions.xmap" check-reload="yes" />
+      </map:match>
+
+      <map:match pattern="site.xml">
+        <map:mount uri-prefix="" src="aggregate.xmap" check-reload="yes" />
+      </map:match>
+
+      <map:match pattern="**.xml">
+        <map:mount uri-prefix="" src="forrest.xmap" check-reload="yes" />
+      </map:match>
+
+    </map:pipeline>
+
+
+    <!-- ============================================================ -->
+    <!-- INTERMEDIATE FORMATS                                         -->
+    <!--                          Tabs, menus and body HTML.          -->
+    <!--                       Called from output format pipelines    -->
+    <!-- ============================================================ -->
+    <map:pipeline internal-only="false">
+
+      <!-- External matches -->
+      <!-- (HTML rendered directly from special formats) -->
+      <map:match pattern="**body-faq.html">
+        <map:mount uri-prefix="" src="faq.xmap" check-reload="yes" />
+      </map:match>
+
+      <map:match pattern="**body-*.html">
+        <map:select type="exists">
+          <map:when test="content/xdocs/{1}{2}.ehtml">
+            <map:generate src="content/xdocs/{1}{2}.ehtml" />
+            <map:transform src="resources/stylesheets/html2htmlbody.xsl" />
+            <map:transform type="linkrewriter" src="cocoon:/{1}linkmap-{2}.html"/>
+            <map:serialize type="xml" />
+          </map:when>
+        </map:select>
+      </map:match>
+
+      <!-- Default matches -->
+      <!-- (HTML rendered from doc-v11 intermediate format -->
+      <map:match pattern="**body-*.html">
+        <map:generate src="cocoon:/{1}{2}.xml"/>
+        <map:transform type="idgen"/>
+        <map:transform type="xinclude"/>
+        <map:transform type="linkrewriter" src="cocoon:/{1}linkmap-{2}.html"/>
+        <map:call resource="skinit">
+          <map:parameter name="type" value="document2html"/>
+          <map:parameter name="path" value="/{1}{2}.xml"/>
+          <map:parameter name="notoc" value="false"/>
+        </map:call>
+      </map:match>
+
+      <map:match pattern="**menu-*.html">
+        <map:generate src="cocoon:/{1}book-{2}.html"/>
+        <map:transform type="linkrewriter" src="cocoon:/{1}linkmap-{2}.html"/>
+        <map:call resource="skinit">
+          <map:parameter name="type" value="book2menu"/>
+          <map:parameter name="path" value="/{1}{2}.xml"/>
+        </map:call>
+      </map:match>
+
+      <map:match pattern="**tab-*.html">
+        <map:generate src="content/xdocs/tabs.xml" />
+        <map:transform type="linkrewriter" src="cocoon:/{1}linkmap-{2}.html"/>
+        <map:call resource="skinit">
+          <map:parameter name="type" value="tab2menu"/>
+          <map:parameter name="path" value="{1}{2}"/>
+        </map:call>
+      </map:match>
+
+      <map:match pattern="**book-*.html">
+        <map:mount uri-prefix="" src="navigation.xmap" check-reload="yes" />
+      </map:match>
+
+
+
+
+    </map:pipeline>
+
+
+    <map:pipeline internal-only="false">
+
       <!-- ============================================================ -->
       <!-- OUTPUT FORMATS                                               -->
       <!--                  Serves content directly to the user         -->
       <!-- +==========================================================+ -->
 
       <map:match type="regexp" pattern="^.+$">
-        <map:act type="resource-exists">
-          <map:parameter name="url" value="content/{0}" />
-          <map:mount uri-prefix="" src="raw.xmap" check-reload="yes" />
-        </map:act>
+        <map:select type="exists">
+          <map:when test="content/{0}">
+            <map:mount uri-prefix="" src="raw.xmap" check-reload="yes" />
+          </map:when>
+        </map:select>
       </map:match>
 
       <map:match pattern="*.html">
         <map:aggregate element="site">
-          <map:part src="cocoon:/tab-{1}.xml"/>
-          <map:part src="cocoon:/menu-{1}.xml"/>
-          <map:part src="cocoon:/body-{1}.xml"/>
+          <map:part src="cocoon:/tab-{0}"/>
+          <map:part src="cocoon:/menu-{0}"/>
+          <map:part src="cocoon:/body-{0}"/>
         </map:aggregate>
         <map:call resource="skinit">
           <map:parameter name="type" value="site2xhtml"/>
@@ -159,9 +287,9 @@
 
       <map:match pattern="**/*.html">
         <map:aggregate element="site">
-          <map:part src="cocoon:/{1}/tab-{2}.xml"/>
-          <map:part src="cocoon:/{1}/menu-{2}.xml"/>
-          <map:part src="cocoon:/{1}/body-{2}.xml"/>
+          <map:part src="cocoon:/{1}/tab-{2}.html"/>
+          <map:part src="cocoon:/{1}/menu-{2}.html"/>
+          <map:part src="cocoon:/{1}/body-{2}.html"/>
         </map:aggregate>
         <map:call resource="skinit">
           <map:parameter name="type" value="site2xhtml"/>
@@ -169,8 +297,26 @@
         </map:call>
       </map:match>
 
+
+      <!-- Special matcher for FAQ PDFs, so we can pass an extra
+      'numbersections' param into document2fo.xsl -->
+      <map:match pattern="**faq.pdf">
+        <map:generate src="cocoon:/{1}faq.xml"/>
+        <map:transform src="skins/{forrest:skin}/xslt/fo/document2fo.xsl">
+          <map:parameter name="numbersections" value="false"/>
+          <map:parameter name="ctxbasedir" value="{realpath:.}/"/>
+          <map:parameter name="xmlbasedir" value="content/xdocs/{1}"/>
+        </map:transform>
+        <map:serialize type="fo2pdf"/>
+      </map:match>
+
       <map:match type="regexp" pattern="^(.*?)([^/]*).pdf$">
         <map:generate src="cocoon:/{1}{2}.xml"/>
+        <!--
+        <map:transform type="idgen"/>
+        -->
+        <map:transform type="xinclude"/>
+        <map:transform type="linkrewriter" src="cocoon://{1}linkmap-{2}.pdf"/>
         <map:transform src="skins/{forrest:skin}/xslt/fo/document2fo.xsl">
           <map:parameter name="ctxbasedir" value="{realpath:.}/"/>
           <map:parameter name="xmlbasedir" value="content/xdocs/{1}"/>
@@ -200,117 +346,6 @@
     </map:pipeline>
 
 
-    <!-- ============================================================ -->
-    <!-- INTERMEDIATE FORMATS                                         -->
-    <!--                          Tabs, menus and body HTML.          -->
-    <!--                       Called from output format pipelines    -->
-    <!-- ============================================================ -->
-    <map:pipeline internal-only="false">
-
-      <!-- External matches -->
-      <!-- (HTML rendered directly from special formats) -->
-      <map:match pattern="**body-faq.xml">
-        <map:mount uri-prefix="" src="faq.xmap" check-reload="yes" />
-      </map:match>
-
-      <map:match pattern="**body-*.xml">
-        <map:act type="resource-exists">
-          <map:parameter name="url" value="content/xdocs/{1}{2}.ehtml" />
-          <map:generate src="content/xdocs/{../1}{../2}.ehtml" />
-          <map:transform src="resources/stylesheets/html2htmlbody.xsl" />
-          <map:serialize type="xml" />
-        </map:act>
-      </map:match>
-
-      <!-- Default matches -->
-      <!-- (HTML rendered from doc-v11 intermediate format -->
-      <map:match pattern="**body-*.xml">
-        <map:generate src="cocoon:/{1}{2}.xml"/>
-        <map:transform type="xinclude"/>
-        <map:transform type="linkrewriter" src="cocoon:/{1}linkmap">
-          <map:parameter name="schemes" value="site ext"/>
-        </map:transform>
-        <map:call resource="skinit">
-          <map:parameter name="type" value="document2html"/>
-          <map:parameter name="path" value="/{1}{2}.xml"/>
-          <map:parameter name="notoc" value="false"/>
-        </map:call>
-      </map:match>
-
-      <map:match pattern="**menu-*.xml">
-        <map:generate src="cocoon:/{1}book.xml"/>
-        <map:transform type="linkrewriter" src="cocoon:/{1}linkmap">
-          <map:parameter name="schemes" value="site ext"/>
-        </map:transform>
-        <map:call resource="skinit">
-          <map:parameter name="type" value="book2menu"/>
-          <map:parameter name="path" value="/{1}{2}.xml"/>
-        </map:call>
-      </map:match>
-
-      <map:match pattern="**tab-*.xml">
-        <map:generate src="cocoon:/{1}tab.xml" />
-        <map:transform type="linkrewriter" src="cocoon:/{1}linkmap">
-          <map:parameter name="schemes" value="site ext"/>
-        </map:transform>
-        <map:call resource="skinit">
-          <map:parameter name="type" value="tab2menu"/>
-          <map:parameter name="path" value="{1}{2}"/>
-        </map:call>
-      </map:match>
-    </map:pipeline>
-
-    <!-- ============================================================ -->
-    <!-- SOURCE FORMATS                                               -->
-    <!--                 Raw XML sources, typically doc-v11 format    -->
-    <!-- ============================================================ -->
-    <map:pipeline internal-only="false">
- 
-      <map:match pattern="**book.xml">
-        <map:mount uri-prefix="" src="navigation.xmap" check-reload="yes" />
-      </map:match>
-
-      <map:match pattern="**tab.xml">
-        <map:mount uri-prefix="" src="navigation.xmap" check-reload="yes" />
-      </map:match>
-
-      <map:match pattern="changes.xml">
-        <map:mount uri-prefix="" src="status.xmap" check-reload="yes" />
-      </map:match>
-
-      <map:match pattern="todo.xml">
-        <map:mount uri-prefix="" src="status.xmap" check-reload="yes" />
-      </map:match>
-
-      <map:match pattern="**dtdx.xml">
-        <map:mount uri-prefix="" src="dtd.xmap" check-reload="yes" />
-      </map:match>
-
-      <map:match pattern="**linkmap**">
-        <map:mount uri-prefix="" src="linkmap.xmap" check-reload="yes" />
-      </map:match>
-
-      <map:match pattern="**issues.xml">
-        <map:mount uri-prefix="" src="issues.xmap" check-reload="yes" />
-      </map:match>
-
-      <map:match pattern="**faq.xml">
-        <map:mount uri-prefix="" src="faq.xmap" check-reload="yes" />
-      </map:match>
-
-      <map:match pattern="community/**index.xml">
-        <map:mount uri-prefix="" src="forrest.xmap" check-reload="yes" />
-      </map:match>
-
-      <map:match pattern="community/*/**">
-        <map:mount uri-prefix="" src="revisions.xmap" check-reload="yes" />
-      </map:match>
-
-      <map:match pattern="**.xml">
-        <map:mount uri-prefix="" src="forrest.xmap" check-reload="yes" />
-      </map:match>
-
-    </map:pipeline>
 
     <!-- ============================================================ -->
     <!-- REDIRECTS                                                    -->
@@ -318,10 +353,10 @@
     <map:pipeline internal-only="false">
 
       <map:match pattern="">
-        <map:redirect-to uri="index.html"/>
+        <map:redirect-to uri="index.html" />
       </map:match>
       <map:match type="regexp" pattern="^.+/$">
-          <map:redirect-to uri="cocoon:/{0}/index.html" />
+          <map:redirect-to uri="index.html"/>
       </map:match>
     </map:pipeline>