diff --git a/xdoc/plugin.jelly b/xdoc/plugin.jelly
index eed7fa3e..8e941292 100644
--- a/xdoc/plugin.jelly
+++ b/xdoc/plugin.jelly
@@ -361,6 +361,9 @@
       <maven:pluginVar var="maven.xdoc.jsl" 
         plugin='maven-xdoc-plugin' property='maven.xdoc.jsl' />
       
+      <!-- copy old value for restoring it later -->
+      <j:set var="previous.plugin.resources" value="${plugin.resources}" />
+
       <maven:pluginVar var="plugin.resources" 
         plugin='maven-xdoc-plugin' property='plugin.resources' />
         
@@ -386,15 +389,22 @@
   
       <doc:performJSL srcdir="${srcdir}" destdir="${maven.docs.dest}" />
 
+      <!-- restore plugin.resources -->
+      <j:set var="plugin.resources" value="${previous.plugin.resources}" />
+
     </define:tag>
     
     <!--
      | escapes a string for generating a valid name token (need for "name" attribute in html anchors)
      | @value given token
     --> 
-    <!-- fixme: is there any better way to replace multiple chars using jelly (and maybe with a working trim)? -->
-    <define:tag name="escapeNameToken"><util:replace var="escapedToken" oldChar=" " newChar="_" value="${value}"/><util:replace var="escapedToken" oldChar="." newChar="_" value="${escapedToken}"/><util:replace var="escapedToken" oldChar="," newChar="_" value="${escapedToken}"/><util:replace var="escapedToken" oldChar="!" newChar="_" value="${escapedToken}"/><util:replace var="escapedToken" oldChar="?" newChar="_" value="${escapedToken}"/><util:replace var="escapedToken" oldChar="/" newChar="_" value="${escapedToken}"/><util:replace var="escapedToken" oldChar="(" newChar="_" value="${escapedToken}"/><util:replace var="escapedToken" oldChar=")" newChar="_" value="${escapedToken}"/>${escapedToken}</define:tag>
-    
+     <define:tag name="escapeNameToken">
+     <j:invokeStatic var="escapedtoken" className="org.apache.commons.lang.StringUtils" method="replaceChars">
+        <j:arg type="java.lang.String" value="${value}" useContextClassLoader="true"/>
+        <j:arg type="java.lang.String" value=" .,;!?/'\()[]{}+*°" useContextClassLoader="true"/>
+        <j:arg type="java.lang.String" value="__________________" useContextClassLoader="true"/>
+     </j:invokeStatic>${escapedtoken}</define:tag>
+
   </define:taglib>
 
   <!-- ================================================================== -->
diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml
index ca3cd220..d52a57c2 100644
--- a/xdoc/xdocs/changes.xml
+++ b/xdoc/xdocs/changes.xml
@@ -25,6 +25,7 @@
   </properties>
   <body>
     <release version="1.7-SNAPSHOT" date="in CVS">
+      <action dev="brett" type="fix" issue="MPXDOC-95" due-to="fabrizio giustina">jslToSite fix, escapeNameTokens improvement</action>
       <action dev="brett" type="fix" issue="MPXDOC-63">make anchor tags not wrap text, but sit in front of it</action>
       <action dev="brett" type="fix" due-to="Chad McHenry" issue="MPXDOC-78">indent nested menus in navigation</action>
       <action dev="brett" type="fix">remove changes-report.xml which was generating over the top of the actual report. This information already exists in the changes plugin documentation.</action>