diff --git a/xdoc/plugin.jelly b/xdoc/plugin.jelly
index 193adc8a..591b9d28 100644
--- a/xdoc/plugin.jelly
+++ b/xdoc/plugin.jelly
@@ -159,12 +159,20 @@
     </define:tag>
 
     <define:tag name="itemLink">
-      <j:set var="leaveLinkAlone" value="${(link.indexOf(':') >= 0) or link.startsWith('/site')}"/>
+      <j:set var="leaveLinkAlone" value="${(link.indexOf(':') >= 0) or link.startsWith('/')}"/>
       <j:if test="${leaveLinkAlone}">
         <a href="${link}">${name}</a>
       </j:if>
       <j:if test="${!leaveLinkAlone}">
-        <a href="${relativePath}${link}">${name}</a>
+        <j:if test='${relativePath.equals(".")}'>
+          <a href="${link}">${name}</a>
+	</j:if>        
+        <j:if test="${relativePath.endsWith('/')}">
+          <a href="${relativePath}${link}">${name}</a>
+	</j:if>
+        <j:if test='${!relativePath.endsWith("/") and !relativePath.equals(".")}'>
+          <a href="${relativePath}/${link}">${name}</a>
+	</j:if>	
       </j:if>
     </define:tag>