diff --git a/src/fr/devinsy/statoolinfos/htmlize/ServiceListView.java b/src/fr/devinsy/statoolinfos/htmlize/ServiceListView.java
index a5ec22f..a6f333c 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/ServiceListView.java
+++ b/src/fr/devinsy/statoolinfos/htmlize/ServiceListView.java
@@ -71,7 +71,10 @@ public class ServiceListView
                 data.setEscapedContent("serviceListLine", index, "serviceListLineUrlLink", service.getWebsite());
                 data.setEscapedContent("serviceListLine", index, "serviceListLineWebsiteLink", service.getWebsite());
                 data.setAttribute("serviceListLine", index, "serviceListLineWebsiteLink", "href", service.getWebsite());
-                data.setEscapedContent("serviceListLine", index, "serviceListLineSoftware", service.getSoftwareName());
+
+                data.setEscapedContent("serviceListLine", index, "serviceListLineSoftwareLink", service.getSoftwareName());
+                data.setAttribute("serviceListLine", index, "serviceListLineSoftwareLink", "href", "software-" + service.getSoftwareTechnicalName() + ".xhtml");
+
                 data.setEscapedContent("serviceListLine", index, "serviceListLineDate", service.getCrawledDate().toString());
 
                 data.setAttribute("serviceListLine", index, "serviceStatusImg", "src", "status-" + service.getStatus().toString().toLowerCase() + ".png");
diff --git a/src/fr/devinsy/statoolinfos/htmlize/serviceListView.xhtml b/src/fr/devinsy/statoolinfos/htmlize/serviceListView.xhtml
index 12ec673..641ccda 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/serviceListView.xhtml
+++ b/src/fr/devinsy/statoolinfos/htmlize/serviceListView.xhtml
@@ -42,7 +42,9 @@
 						</a>
 					</td>
 					<td id="serviceListLineWebsite"><a href="#" id="serviceListLineWebsiteLink">n/a</a></td>
-					<td id="serviceListLineSoftware">n/a</td>
+					<td id="serviceListLineSoftware">
+						<a href="#" id="serviceListLineSoftwareLink" title="">n/a</a>
+					</td>
 					<td id="serviceListLineUserCount" class="td_number">n/a</td>
 
 					<td id="" class="td_icon_alone">