diff --git a/Netdisco/Changes b/Netdisco/Changes
index 758538c7..8e037668 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -3,6 +3,8 @@
   [ENHANCEMENTS]
 
   * When linking to devices, use the DNS name in preference to the IP
+    (makes for more attractive navigation search bar, but need to watch for aliases)
+  * In general, device names do not have domain_suffix trimmed, but nodes do
 
   [BUG FIXES]
 
diff --git a/Netdisco/share/views/ajax/device/addresses.tt b/Netdisco/share/views/ajax/device/addresses.tt
index 11d38c13..8fba4a97 100644
--- a/Netdisco/share/views/ajax/device/addresses.tt
+++ b/Netdisco/share/views/ajax/device/addresses.tt
@@ -12,7 +12,7 @@
     [% WHILE (row = results.next) %]
     <tr>
       <td>[% row.alias %]</a>
-      <td>[% row.dns.remove(settings.domain_suffix) %]</a>
+      <td>[% row.dns %]</a>
       <td class="center_cell"><a class="nd_linkcell"
         href="[% device_ports %]&q=[% params.q | uri %]&f=[% row.port | uri %]">[% row.port %]</a></td>
       <td>[% row.device_port.name %]</td>