diff --git a/xdoc/src/plugin-resources/site.jsl b/xdoc/src/plugin-resources/site.jsl
index 755f478a..3ded4b7a 100644
--- a/xdoc/src/plugin-resources/site.jsl
+++ b/xdoc/src/plugin-resources/site.jsl
@@ -3,7 +3,7 @@
 <!--
  * ========================================================================
  * 
- * Copyright 2004 The Apache Software Foundation.
+ * Copyright 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.
@@ -71,14 +71,14 @@
         
         <link rel="stylesheet" type="text/css" href="${relativePath}/style/print.css" media="print"/>
         <meta http-equiv="Content-Type" content="text/html; charset=${outputencoding}"/>
-        <x:forEach var="author" select="./properties/author">
+        <x:forEach var="author" select="$templateContext/properties/author">
           <meta name="author" content="${author.text}"/>
           <meta name="email" content="${author.attribute('email').value}"/>
         </x:forEach>
 
-        <jsl:applyTemplates select="head/*" />
+        <jsl:applyTemplates select="$templateContext/head/*" />
       </head>
-      <jsl:applyTemplates select="$templateContext" />
+      <jsl:applyTemplates select="$templateContext/*" />
     </html>
   </jsl:template>
 
@@ -229,7 +229,7 @@
       <!-- body start -->
       <div id="bodyColumn">
         <div class="contentBox">
-          <jsl:applyTemplates select="$templateContext" />
+          <jsl:applyTemplates select="$templateContext/*" />
         </div>
       </div>
       <div class="clear"><hr /></div>