diff --git a/Netdisco/Changes b/Netdisco/Changes
index 07427f07..f4b67b3f 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -1,3 +1,9 @@
+2.012007 - 2013-08-23
+
+  [ENHANCEMENTS]
+
+  * Display "Auto" when there is no discovered duplex setting
+
 2.012006 - 2013-08-23
 
   [BUG FIXES]
diff --git a/Netdisco/share/views/ajax/device/ports.tt b/Netdisco/share/views/ajax/device/ports.tt
index f2752802..c86584cc 100644
--- a/Netdisco/share/views/ajax/device/ports.tt
+++ b/Netdisco/share/views/ajax/device/ports.tt
@@ -88,7 +88,7 @@
       [% IF params.c_duplex %]
       <td>
         [% IF row.up == 'up' AND row.duplex %]
-        [% row.duplex_admin.ucfirst | html_entity %] / [% row.duplex.ucfirst | html_entity %]
+        [% (row.duplex_admin.ucfirst || 'Auto') | html_entity %] / [% row.duplex.ucfirst | html_entity %]
         [% END %]
       </td>
       [% END %]