diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py
index fb7b4e862..542915e49 100644
--- a/netbox/ipam/models.py
+++ b/netbox/ipam/models.py
@@ -448,13 +448,14 @@ class ServicePort(CreatedUpdatedModel):
     A ServicePort is always associated with a specific IPAddress on a Device.
 
     If an user wants to specify a service running on all IP Addresses on a device,
-    this can be done by assigning the port to the '0.0.0.0/24' IPAddress.
+    this can be done by assigning the port to the '0.0.0.0/32' IPAddress.
 
     The combination of IPAddress, Port Number and Port Type is always unique for ServicePort.
 
-    If a port number + port type combination is assigned to  '0.0.0.0/24' IPAddress,
+    If a port number + port type combination is assigned to '0.0.0.0/32' IPAddress,
     it cannot be assigned to any other IPAddress on the same Device.
     """
+
     ip_address = models.ForeignKey('IPAddress', related_name='service_ports', on_delete=models.CASCADE,
                                    blank=False, null=False, verbose_name='ip_address')
     type = models.PositiveSmallIntegerField(choices=SERVICE_PORT_CHOICES, default=0)
@@ -476,11 +477,17 @@ class ServicePort(CreatedUpdatedModel):
     def get_absolute_url(self):
         return reverse('ipam:serviceport', args=[self.pk])
 
+    @property
+    def short_description(self):
+        if self.description:
+            return self.description[:30]
+        return None
+
     def clean(self):
-        # if port is already assigned on '0.0.0.0/24'
+        # if port is already assigned on '0.0.0.0/32'
         # that means it is assigned on all IPs on the device
         port_assigned_on_all_ips = bool(ServicePort.objects.filter(
-            ip_address__address='0.0.0.0/24', port=self.port, type=self.type).exclude(pk=self.id))
+            ip_address__address='0.0.0.0/32', port=self.port, type=self.type).exclude(pk=self.id))
         if port_assigned_on_all_ips:
             raise ValidationError('Port already assigned on address 0.0.0.0/24')
 
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index 14d5b0869..f4e7824b5 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -205,6 +205,22 @@
                 {% endif %}
             {% endif %}
         </div>
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <strong>Service Ports</strong>
+            </div>
+            {% if service_ports %}
+                <table class="table table-hover panel-body">
+                    {% for port in service_ports %}
+                        {% include 'dcim/inc/_port.html' %}
+                    {% endfor %}
+                </table>
+            {% else %}
+                <div class="panel-body text-muted">
+                    None found
+                </div>
+            {% endif %}
+        </div>
         <div class="panel panel-default">
             <div class="panel-heading">
                 <strong>Critical Connections</strong>
diff --git a/netbox/templates/dcim/inc/_port.html b/netbox/templates/dcim/inc/_port.html
new file mode 100644
index 000000000..8e1b9b0d4
--- /dev/null
+++ b/netbox/templates/dcim/inc/_port.html
@@ -0,0 +1,17 @@
+<tr>
+    <td>
+        {{ port.ip_address }}
+    </td>
+    <td>
+        <a href="{% url 'ipam:serviceport' pk=port.pk %}"> {{ port }} </a>
+    </td>
+    <td>{{ port.name }}</td>
+    <td>
+        {% if port.short_description %}
+            {{ port.short_description }}
+            {% if port.short_description != port.description %}
+                ...
+            {% endif %}
+        {% endif %}
+    </td>
+</tr>