diff --git a/Netdisco/Changes b/Netdisco/Changes
index 8d114239..2393576b 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -15,6 +15,8 @@
   * Fix for node search on some formats of IPv6 addr being seen as MAC
   * [#190] Ignore entries in the discover form that don't look like IP/hostname
   * Delete all job queue entries (regardless of status) when deleting device
+  * [#15] Undiscovered Neighbor report JOIN fixed, and updated to include
+    the ports where Macsuck saw the MAC address of a known Device
 
 2.029014 - 2014-11-19
 
diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Virtual/UndiscoveredNeighbors.pm b/Netdisco/lib/App/Netdisco/DB/Result/Virtual/UndiscoveredNeighbors.pm
index 94d14c18..427e716d 100644
--- a/Netdisco/lib/App/Netdisco/DB/Result/Virtual/UndiscoveredNeighbors.pm
+++ b/Netdisco/lib/App/Netdisco/DB/Result/Virtual/UndiscoveredNeighbors.pm
@@ -22,14 +22,17 @@ __PACKAGE__->result_source_instance->view_definition(<<'ENDSQL');
                                      a.log,
                                      a.finished
     FROM device_port p
-    JOIN device d ON d.ip = p.ip
-    JOIN ADMIN a ON p.remote_ip = a.device
-    WHERE p.remote_ip NOT IN
-        (SELECT ALIAS
-         FROM device_ip)
-      AND a.action = 'discover'
-    ORDER BY p.remote_ip,
-             a.finished DESC
+    JOIN device d
+      ON d.ip = p.ip
+    LEFT JOIN admin a
+      ON (p.remote_ip = a.device AND a.action = 'discover')
+    WHERE
+        (p.remote_ip NOT IN (SELECT alias FROM device_ip))
+      OR
+        ((p.remote_ip IS NULL) AND p.is_uplink)
+    ORDER BY
+      p.remote_ip ASC,
+      a.finished DESC
 ENDSQL
 
 __PACKAGE__->add_columns(
diff --git a/Netdisco/share/views/ajax/admintask/undiscoveredneighbors.tt b/Netdisco/share/views/ajax/admintask/undiscoveredneighbors.tt
index 204b04f8..5bcfb7af 100644
--- a/Netdisco/share/views/ajax/admintask/undiscoveredneighbors.tt
+++ b/Netdisco/share/views/ajax/admintask/undiscoveredneighbors.tt
@@ -1,7 +1,7 @@
 <table id="data-table" class="table table-striped table-bordered" width="100%" cellspacing="0">
   <thead>
     <tr>
-      <th>Device Location Triggering<br>Last Discovery Attempt</th>
+      <th>Observing Device</th>
       <th>Undiscovered Neighbor</th> 
       <th class="nd_center-cell">Last Discovery Attempt</th>
       <th class="nd_center-cell">Last Discovery Log</th>
@@ -12,11 +12,18 @@
     <tr>
       <td><a href="[% device_ports %]&q=[% row.ip | uri %]&f=[% row.port | uri %]">
                [% row.dns || row.name || row.ip | html_entity %] ( [% row.port | html_entity %] ) </a></td>
-      <td><a href="[% search_node %]&q=[% row.remote_ip | uri %]">
-                                 [% row.remote_ip | html_entity %]</a>
-                                 ([% row.remote_port | html_entity %])
-                                 [% ' id: '_ row.remote_id IF row.remote_id %]
-                                 [% ' type: '_ row.remote_type IF row.remote_type %]</td>
+      <td>
+        [% IF row.remote_ip %]
+        <a href="[% search_node %]&q=[% row.remote_ip | uri %]">
+          [% row.remote_ip | html_entity %]
+        </a> ([% row.remote_port | html_entity %])
+        [% '<br />' IF row.remote_id or row.remote_type %]
+        [% ' id: '_ row.remote_id IF row.remote_id %]
+        [% ' type: '_ row.remote_type IF row.remote_type %]
+        [% ELSE %]
+        Known Device's MAC Address seen on this Port during Macsuck
+        [% END %]
+      </td>
       <td class="nd_center-cell">[% row.finished | html_entity %]</td>
       <td class="nd_center-cell">[% row.log | html_entity %]</td>
     </tr>
diff --git a/Netdisco/share/views/ajax/admintask/undiscoveredneighbors_csv.tt b/Netdisco/share/views/ajax/admintask/undiscoveredneighbors_csv.tt
index 78cef5fb..f69d9016 100644
--- a/Netdisco/share/views/ajax/admintask/undiscoveredneighbors_csv.tt
+++ b/Netdisco/share/views/ajax/admintask/undiscoveredneighbors_csv.tt
@@ -1,5 +1,5 @@
 [% USE CSV -%]
-[% CSV.dump([ 'Device Triggering Last Discovery Attempt' 'Device Port'
+[% CSV.dump([ 'Observing Device' 'Device Port'
               'Remote IP' 'Remote Port' 'Remote ID' 'Remote Type'
               'Last Discovery Attempt' 'Discovery Log']) %]