diff --git a/Changes b/Changes
index ab1c617e..b68a0695 100644
--- a/Changes
+++ b/Changes
@@ -1,4 +1,4 @@
-2.039021 - 2018-04-
+2.039021 - 2018-04-10
 
   [BUG FIXES]
 
@@ -6,6 +6,7 @@
   * #390 cannot take logarithm of zero (C. Stromsoe)
   * protect against undef mac (l.e. ferguson)
   * do not include logical aggregate masters in netmap/speed calc
+  * try to match remote port in netmap against port, name, and descr
 
 2.039020 - 2018-03-26
 
diff --git a/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm b/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm
index ad2f00d2..55ef729d 100644
--- a/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm
+++ b/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm
@@ -27,7 +27,11 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
  INNER JOIN device ld ON dp.ip = ld.ip
  INNER JOIN device_ip di ON dp.remote_ip = di.alias
  INNER JOIN device rd ON di.ip = rd.ip
- LEFT OUTER JOIN device_port dp2 ON (di.ip = dp2.ip AND dp.remote_port = dp2.port)
+ LEFT OUTER JOIN device_port dp2
+   ON (di.ip = dp2.ip
+       AND ((dp.remote_port = dp2.port)
+            OR (dp.remote_port = dp2.name)
+            OR (dp.remote_port = dp2.descr)))
 
  WHERE dp.remote_port IS NOT NULL
    AND dp.port !~* 'vlan'