diff --git a/jdepend/src/plugin-resources/jdepend.jsl b/jdepend/src/plugin-resources/jdepend.jsl
index fff414f1..dd526919 100644
--- a/jdepend/src/plugin-resources/jdepend.jsl
+++ b/jdepend/src/plugin-resources/jdepend.jsl
@@ -16,6 +16,7 @@
   <j:useBean var="htmlescape" class="org.apache.velocity.anakia.Escape"/>
   <j:useBean var="fileutil" class="org.apache.velocity.texen.util.FileUtil"/>
   <j:useBean var="pathtool" class="org.apache.maven.DVSLPathTool"/>
+  <j:useBean var="stringTool" class="org.apache.maven.StringTool"/>
 
   <define:taglib uri="jdepend">
     <define:tag name="nav">
@@ -44,9 +45,23 @@
         </j:when>
         <j:otherwise>
           <j:forEach var="class" items="${currentNode.selectNodes(xpath)}">
-            <j:set var="index" value="${class.getStringValue().lastIndexOf('.') + 1}"/>
-            <util:replace var="dir" oldChar="." newChar="/" value="${class.getStringValue()}"/>
-            <a href="xref/${dir}.html">${class.getStringValue().substring(mavenTool.toInteger(index.toString()))}</a>
+            <!-- class.StringValue =~ org.apache.maven.SomeClass -->
+            <j:set var="packageName" value="${stringTool.splitStringAtLastDelim(class.StringValue, '.').get(0)}"/>
+            <j:set var="className" value="${stringTool.splitStringAtLastDelim(class.StringValue, '.').get(1)}"/>
+            <util:replace var="dir" oldChar="." newChar="/" value="${packageName}"/>
+            
+            <j:choose>
+		      <j:when test="${class.attribute('sourceFile') != null}">
+	            <j:set var="classSourceFile" value="${class.attribute('sourceFile').getValue()}"/>
+	            <j:set var="classSourceFile" value="${stringTool.splitStringAtLastDelim(classSourceFile, '.').get(0)}"/>
+	            
+                <a href="xref/${dir}/${classSourceFile}.html">${className}</a>
+              </j:when>
+              <j:otherwise>
+            	<a href="xref/${dir}/${className}.html">${className}</a>
+              </j:otherwise>
+            </j:choose>
+          
             <br/>
           </j:forEach>
         </j:otherwise>