diff --git a/xdoc/plugin.jelly b/xdoc/plugin.jelly
index 89037f84..7b77308d 100644
--- a/xdoc/plugin.jelly
+++ b/xdoc/plugin.jelly
@@ -159,21 +159,12 @@
     </define:tag>
 
     <define:tag name="itemLink">
-      <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}">
-        <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>
+    	<!--
+    		@link
+    		@relativePath
+    		@name
+    	  -->
+    	<a href="${pathTool.calculateLink(link,relativePath)}">${name}</a>
     </define:tag>
     
     <define:tag name="text-xdoc">