diff --git a/actors/linux/.gitignore b/actors/linux/.gitignore
index 5b3aa44ec..179245cd5 100644
--- a/actors/linux/.gitignore
+++ b/actors/linux/.gitignore
@@ -1 +1 @@
-/udsactor-opensuse-1.7.0.spec
+/udsactor-*1.*.spec
diff --git a/server/src/uds/templates/uds/html5/download_client.html b/server/src/uds/templates/uds/html5/download_client.html
index fdff0fb7f..93f87e2a6 100644
--- a/server/src/uds/templates/uds/html5/download_client.html
+++ b/server/src/uds/templates/uds/html5/download_client.html
@@ -10,23 +10,23 @@
     <div class="col-md-8 col-md-offset-2 bg-primary img-rounded">
         <h3>{% trans 'Download UDS Plugin for' %} {{ os|osName }}</h3>
         <p>{% trans 'In order to be able to execute UDS services, you need to have UDS plugin installed.' %}</p>
-        <p class="text-center">{{ os|pluginDownloadUrl|safe }}</a></p>
+        <div class="text-center">{{ os|pluginDownloadUrl|safe }}</div>
         <h3>{% trans 'Or download another version' %}</h3>
         <p>{% trans 'In case that your platform has been incorrectly detected, you can download manually the version required for your Operating System' %}</p>
         <p>
             {% if os != 'linux' %}
             <p class="text-center">
-                <a href="#" class="btn btn-warning">{% trans 'Linux UDS plugin' %}</a>
+                <a href="{% url 'uds.web.views.client_downloads' os='Linux' %}" class="btn btn-warning">{% trans 'Linux UDS plugin' %}</a>
             </p>
             {% endif %}
             {% if os != 'windows' %}
             <p class="text-center">
-                <a href="#" class="btn btn-warning">{% trans 'Windows UDS plugin' %}</a>
+                <a href="{% url 'uds.web.views.client_downloads' os='Windows' %}" class="btn btn-warning">{% trans 'Windows UDS plugin' %}</a>
             </p>
             {% endif %}
             {% if os != 'mac' %}
             <p class="text-center">
-                <a href="#" class="btn btn-warning">{% trans 'Mac OSX (>10.5) UDS plugin' %}</a>
+                <a href="{% url 'uds.web.views.client_downloads' os='Mac' %}" class="btn btn-warning">{% trans 'Mac OSX (>10.5) UDS plugin' %}</a>
             </p>
             {% endif %}
         </p>
@@ -45,7 +45,7 @@
            {% trans "In this case, you will have to manually download the plugin by using the menu on upper right corner." %}</p>
         <p class="text-center">
             <a href="{% url 'uds.web.views.index' %}" class="btn btn-info"><i class="fa fa-home"></i> {% trans "Return" %}</a>
-        </div>
+        </p>
         {% endif %}
     </div>
 </div>
diff --git a/server/src/uds/templatetags/html5.py b/server/src/uds/templatetags/html5.py
index 3c82446c4..39c54ebf9 100644
--- a/server/src/uds/templatetags/html5.py
+++ b/server/src/uds/templatetags/html5.py
@@ -217,9 +217,19 @@ def osName(os):
 @register.filter(name='pluginDownloadUrl')
 def pluginDownloadUrl(os):
     tmpl = '<a href="{url}" class="btn btn-success">' + _('Download UDS Plugin for') + ' {os}</a>'
+
     if os == 'windows':
-        return tmpl.format(url=static('client/UDSClientSetup.exe'), os='Windows')
+        return tmpl.format(url=static('clients/UDSClientSetup.exe'), os='Windows')
     elif os == 'linux':
-        return '2'
+        linux_packages = (
+            ('udsclient_1.7.5_all.deb', _('Debian based Linux')),
+            ('udsclient-1.7.5-1.noarch.rpm', _('Red Hat based Linux (RH, Fedora, Centos, ...)')),
+            ('udsclient-opensuse-1.7.5-1.noarch.rpm', _('Suse based Linux')),
+            ('udsclient-1.7.5.tar.gz', _('Generic .tar.gz Linux'))
+        )
+        res = ''
+        for v in linux_packages:
+            res += '<p class="text-center">' + tmpl.format(url=static('clients/' + v[0]), os=v[1]) + '</p>'
+        return res
     else:
-        return tmpl.format(url=static('client/UDSClient.dmg'), os='Mac OSX')
+        return tmpl.format(url=static('clients/UDSClient.dmg'), os='Mac OSX')