diff --git a/Netdisco/Changes b/Netdisco/Changes
index 3fb4a258..ee04a30b 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -5,6 +5,7 @@
   * Ignore devices with "phone" in their CDP/LLDP platform description
   * Change log format to contain UTC timestamp
   * Link to VLAN search by name from VLAN Inventory report
+  * Neighbor device links to both device and port (fragfutter)
 
   [BUG FIXES]
 
diff --git a/Netdisco/share/views/ajax/device/ports.tt b/Netdisco/share/views/ajax/device/ports.tt
index 059be403..dfd7b898 100644
--- a/Netdisco/share/views/ajax/device/ports.tt
+++ b/Netdisco/share/views/ajax/device/ports.tt
@@ -19,7 +19,7 @@
       [% END %]
     </tr>
   </thead>
-  </tbody>
+  <tbody>
     [% FOREACH row IN results %]
     <tr>
       <td class="nd_center-cell nd_devport-icon">
@@ -248,10 +248,14 @@
             [% ELSIF row.remote_type AND row.remote_type.match('(cisco\s+AIR-[L|C]?AP|-K9W8-|^AP:\s)') %]
               <i class="icon-signal"></i>&nbsp;
             [% END %]
-            <a href="[% uri_for('/device',
-                  self_options) %]&q=[% row.neighbor.ip | uri %]&f=[% row.remote_port | uri %]&prefer=port">
-            [% row.neighbor.dns.remove(settings.domain_suffix) || row.neighbor.ip | html_entity %]
-            [% ' - ' IF row.remote_port %][% row.remote_port | html_entity %]</a><br/>
+            <a href="[% uri_for('/device', self_options) %]&q=[% row.neighbor.ip | uri %]">
+                [% row.neighbor.dns.remove(settings.domain_suffix) || row.neighbor.ip | html_entity %]</a>
+            [% IF row.remote_port %]
+                -
+                <a href="[% uri_for('/device', self_options) %]&q=[% row.neighbor.ip | uri %]&f=[% row.remote_port | uri %]&prefer=port">
+                    [% row.remote_port | html_entity %]</a>
+            [% END %]
+            <br/>
             [% IF params.neigh_id and (row.remote_id or row.remote_type) %]
               ([% 'id: '_ row.remote_id IF row.remote_id %]
               [% ' type: '_ row.remote_type IF row.remote_type %])<br/>