diff --git a/Netdisco/lib/Netdisco/DB/ResultSet/Node.pm b/Netdisco/lib/Netdisco/DB/ResultSet/Node.pm
new file mode 100644
index 00000000..da472b25
--- /dev/null
+++ b/Netdisco/lib/Netdisco/DB/ResultSet/Node.pm
@@ -0,0 +1,26 @@
+package Netdisco::DB::ResultSet::Node;
+use base 'DBIx::Class::ResultSet';
+
+sub by_mac {
+    my ($set, $archive, $mac) = @_;
+    return $set unless $mac;
+
+    return $set->search(
+      {
+        'me.mac' => $mac,
+        ($archive ? () : (active => 1)),
+      },
+      {
+        order_by => {'-desc' => 'time_last'},
+        columns => [qw/ mac switch port oui active device.dns /],
+        '+select' => [
+          \"to_char(time_first, 'YYYY-MM-DD HH24:MI')",
+          \"to_char(time_last, 'YYYY-MM-DD HH24:MI')",
+        ],
+        '+as' => [qw/ time_first time_last /],
+        join => 'device',
+      },
+    );
+}
+
+1;
diff --git a/Netdisco/lib/Netdisco/DB/ResultSet/NodeIp.pm b/Netdisco/lib/Netdisco/DB/ResultSet/NodeIp.pm
index cbab1019..92fba8b5 100644
--- a/Netdisco/lib/Netdisco/DB/ResultSet/NodeIp.pm
+++ b/Netdisco/lib/Netdisco/DB/ResultSet/NodeIp.pm
@@ -57,4 +57,20 @@ sub by_name {
     );
 }
 
+sub by_mac {
+    my ($set, $archive, $mac) = @_;
+    return $set unless $mac;
+
+    return $set->search(
+      {
+        mac => $mac,
+        ($archive ? () : (active => 1)),
+      },
+      {
+        %$search_attr,
+        ( $set->has_dns_col ? ('+columns' => 'dns') : () ),
+      }
+    );
+}
+
 1;
diff --git a/Netdisco/lib/Netdisco/Web.pm b/Netdisco/lib/Netdisco/Web.pm
index 873b5b97..14b05743 100644
--- a/Netdisco/lib/Netdisco/Web.pm
+++ b/Netdisco/lib/Netdisco/Web.pm
@@ -3,11 +3,12 @@ package Netdisco::Web;
 use Dancer ':syntax';
 use Dancer::Plugin::Ajax;
 use Dancer::Plugin::DBIC;
+use Dancer::Exception ':all';
 
 use Digest::MD5 ();
-use Socket6 ();
+use Socket6 (); # to ensure dependency is met
 use NetAddr::IP::Lite ':lower';
-use Regexp::Common 'net';
+use Net::MAC ();
 
 hook 'before' => sub {
     if (! session('user') && request->path !~ m{^/login}) {
@@ -40,17 +41,25 @@ ajax '/ajax/content/search/:thing' => sub {
 ajax '/ajax/content/search/node' => sub {
     my $node = param('q');
     return unless $node;
-    my $set;
+    content_type('text/html');
 
-    # if mac
-      # search on mac
-    # try to make ip
-      # search on ip
-    # text search for node dns
+    try {
+        my $mac = Net::MAC->new(mac => $node);
+        my $ips = schema('netdisco')->resultset('NodeIp')
+          ->by_mac(param('archived'), $mac->as_IEEE);
+        return unless $ips->count;
 
-    if ($node =~ m/^$RE{net}{MAC}$/) {
+        my $ports = schema('netdisco')->resultset('Node')
+          ->by_mac(param('archived'), $mac->as_IEEE);
+
+        template 'ajax/node_by_mac.tt', {
+          ips => $ips,
+          ports => $ports,
+        }, { layout => undef };
     }
-    else {
+    catch {
+        my $set;
+
         if (my $ip = NetAddr::IP::Lite->new($node)) {
             # by_ip() will extract cidr notation if necessary
             $set = schema('netdisco')->resultset('NodeIp')
@@ -64,11 +73,10 @@ ajax '/ajax/content/search/node' => sub {
             return unless $set->count;
         }
 
-        content_type('text/html');
-        template 'ajax/node.tt', {
+        template 'ajax/node_by_ip.tt', {
           results => $set,
         }, { layout => undef };
-    }
+    };
 };
 
 # devices carrying vlan xxx
diff --git a/Netdisco/views/ajax/node.tt b/Netdisco/views/ajax/node_by_ip.tt
similarity index 100%
rename from Netdisco/views/ajax/node.tt
rename to Netdisco/views/ajax/node_by_ip.tt
diff --git a/Netdisco/views/ajax/node_by_mac.tt b/Netdisco/views/ajax/node_by_mac.tt
new file mode 100644
index 00000000..df749a04
--- /dev/null
+++ b/Netdisco/views/ajax/node_by_mac.tt
@@ -0,0 +1,67 @@
+<table class="bordered-table condensed-table zebra-striped">
+  <thead>
+    <tr>
+      <th>MAC</th>
+      [% IF params.vendor %]
+      <th>Vendor</th>
+      [% END %]
+      <th>Match</th>
+      <th>Device or Node</th>
+      [% IF params.stamps %]
+      <th>First Seen</th>
+      <th>Last Seen</th>
+      [% END %]
+    </tr>
+  </thead>
+  </tbody>
+    [% SET first_row = 1 %]
+    [% WHILE (row = ips.next) %]
+    <tr>
+      <td>
+        [% IF first_row %]
+        <a class="nd_linkcell"
+          href="/search?[% vars.query_defaults.node %]&q=[% row.mac | uri %]">[% row.mac %]</a>
+        [% ELSE %]
+        &nbsp;
+        [% END %]
+      </a>
+      [% IF params.vendor %]
+      <td>
+        [% IF first_row %]
+        [% row.oui.company %]
+        [% ELSE %]
+        &nbsp;
+        [% END %]
+      </td>
+      [% END %]
+      <td>MAC &rarr; IP</td>
+      <td><a href="/search?[% vars.query_defaults.node %]&q=[% row.ip | uri %]">[% row.ip %]</a>
+        [% ' (' _ row.dns.remove(settings.domain_suffix) _ ')' IF row.dns %]
+        [% ' <span class="label warning">a</span>' IF NOT row.active %]
+      </td>
+      [% IF params.stamps %]
+      <td>[% row.time_first %]</td>
+      <td>[% row.time_last %]</td>
+      [% END %]
+    </tr>
+    [% SET first_row = 0 %]
+    [% END %]
+    [% WHILE (node = ports.next) %]
+    <tr>
+      <td>&nbsp;</td>
+      [% IF params.vendor %]
+      <td>&nbsp;</td>
+      [% END %]
+      <td>Switch Port</td>
+      <td><a href="/device?q=[% node.switch | url %]&port=[% node.port | url %]">[% node.switch %] [ [% node.port %] ]</a>
+        [% ' (' _ node.device.dns.remove(settings.domain_suffix) _ ')' IF node.device.dns %]
+        [% ' <span class="label warning">a</span>' IF NOT node.active %]
+      </td>
+      [% IF params.stamps %]
+      <td>[% node.time_first %]</td>
+      <td>[% node.time_last %]</td>
+      [% END %]
+    </tr>
+    [% END %]
+  </tbody>
+</table>