diff --git a/xdoc/src/plugin-resources/site.jsl b/xdoc/src/plugin-resources/site.jsl
index ac0f1b69..5f46f467 100644
--- a/xdoc/src/plugin-resources/site.jsl
+++ b/xdoc/src/plugin-resources/site.jsl
@@ -167,7 +167,7 @@
             <j:set var="fileName">${file}</j:set>
             <j:set var="poweredbyimage">${maven.xdoc.poweredby.image}</j:set>
             <j:set var="poweredbytitle">${maven.xdoc.poweredby.title}</j:set>
-            <j:set var="poweredbyurl">${maven.xdoc.poweredby.url}</j:set>
+            <j:set var="poweredbyurl" value="${maven.xdoc.poweredby.url}" />
             <j:if test="${!empty(poweredbyimage)}">
               <a id="poweredBy" href="${poweredbyurl}" title="${poweredbytitle}">
                 <img alt="${maven.xdoc.poweredby.title}" src="${relativePath}/images/logos/${poweredbyimage}" />
@@ -453,7 +453,7 @@
       <x:forEach var="attr" select="@*">
         <j:choose>
           <j:when test="${attr.name == 'href'}">
-            <j:set var="href">${attr.value}</j:set>
+            <j:set var="href" value="${attr.value}" />
             <j:choose>                 
               <j:when test="${href.startsWith('#')}">
               	<x:attribute name="href">
@@ -480,8 +480,8 @@
           </j:when>
           <j:when test="${attr.name == 'name'}">
             <x:attribute name="name">
-          	  <doc:escapeNameToken value="${attr.value}"/>
-          	</x:attribute>
+              <doc:escapeNameToken value="${attr.value}"/>
+            </x:attribute>
           </j:when>
           <j:otherwise>
             <x:attribute name="${attr.name}">${attr.value}</x:attribute>