diff --git a/Netdisco/Makefile.PL b/Netdisco/Makefile.PL
index 3c34f9c8..4523ba0c 100644
--- a/Netdisco/Makefile.PL
+++ b/Netdisco/Makefile.PL
@@ -38,7 +38,7 @@ requires 'MCE' => 1.515;
 requires 'Net::Domain' => 1.23;
 requires 'Net::DNS' => 0.72;
 requires 'Net::LDAP' => 0;
-requires 'NetAddr::MAC' => 0.87;
+requires 'NetAddr::MAC' => 0.9;
 requires 'NetAddr::IP' => 4.068;
 requires 'Opcode' => 1.07;
 requires 'Path::Class' => 0.32;
diff --git a/Netdisco/share/views/sidebar/device/ports.tt b/Netdisco/share/views/sidebar/device/ports.tt
index 88213dc3..5618b3ee 100644
--- a/Netdisco/share/views/sidebar/device/ports.tt
+++ b/Netdisco/share/views/sidebar/device/ports.tt
@@ -125,10 +125,9 @@
                   <li>
                     <em class="muted">MAC address format:</em><br/>
                     <select id="nd_mac-format" name="mac_format">
-                      <option[% ' selected="selected"' IF params.mac_format == 'Cisco' %]>Cisco</option>
-                      <option[% ' selected="selected"' IF params.mac_format == 'Microsoft' %] value="Microsoft">IEEE</option>
-                      <option[% ' selected="selected"' IF params.mac_format == 'IEEE' %] value="IEEE">Microsoft</option>
-                      <option[% ' selected="selected"' IF params.mac_format == 'Sun' %]>Sun</option>
+                      [% FOREACH format IN [ 'IEEE', 'Cisco', 'Microsoft', 'Sun' ] %]
+                      <option[% ' selected="selected"' IF params.mac_format == format %]>[% format %]</option>
+                      [% END %]
                     </select>
                   </li>
                   [% FOREACH item IN vars.connected_properties %]
diff --git a/Netdisco/share/views/sidebar/search/node.tt b/Netdisco/share/views/sidebar/search/node.tt
index 19368224..a73eb989 100644
--- a/Netdisco/share/views/sidebar/search/node.tt
+++ b/Netdisco/share/views/sidebar/search/node.tt
@@ -55,10 +55,9 @@
             <div class="clearfix">
               <em class="muted">MAC address format:</em><br/>
               <select id="nd_node-mac-format" name="mac_format">
-                <option[% ' selected="selected"' IF params.mac_format == 'Cisco' %]>Cisco</option>
-                <option[% ' selected="selected"' IF params.mac_format == 'Microsoft' %] value="Microsoft">IEEE</option>
-                <option[% ' selected="selected"' IF params.mac_format == 'IEEE' %] value="IEEE">Microsoft</option>
-                <option[% ' selected="selected"' IF params.mac_format == 'Sun' %]>Sun</option>
+                [% FOREACH format IN [ 'IEEE', 'Cisco', 'Microsoft', 'Sun' ] %]
+                <option[% ' selected="selected"' IF params.mac_format == format %]>[% format %]</option>
+                [% END %]
               </select>
             </div>
             <button id="[% tab.tag %]_submit" type="submit" class="btn btn-info">