diff --git a/client.py b/client.py
index 398a397..13030ed 100755
--- a/client.py
+++ b/client.py
@@ -26,7 +26,7 @@ def call_api(params, path):
 
     return response.json()
 
-def print_data(key, value, suffix = None):
+def print_data(term_cols, key, value, suffix = None):
     if suffix is not None:
         value_cols = term_cols - 26 - len(value)
         print("(0x(B %-18s (0x(B %s %-*.*s (0x(B" %
@@ -59,43 +59,83 @@ def search_ports(args):
             address = call_api(params, 'address/?device_id=%s&interface=%s' % (port['device_id'], port['port_label_short']))
             address6 = call_api(params, 'address/?af=ipv6&device_id=%s&interface=%s' % (port['device_id'], port['port_label_short']))
 
+            term_cols = getattr(shutil.get_terminal_size((80, 20)), 'columns')
+
             if device['device']['disabled'] == "1": continue
             if port['disabled'] == "1": continue
             if port['deleted'] == "1": continue
 
             print("(0l" + "q" * 20 + "w" + "q" * (term_cols - 23) + "k(B")
 
-            print_data("Device", device['device']['hostname'])
-            print_data("", "%s/device/device=%s" %
+            print_data(term_cols, "Device", device['device']['hostname'])
+            print_data(term_cols, "", "%s/device/device=%s" %
                 (params['base_url'], port['device_id']))
-            print_data("Hardware", device['device']['hardware'])
-            print_data("Port", port['port_label_short'])
-            print_data("", "%s/device/device=%s/tab=port/port=%s/" %
+            print_data(term_cols, "Hardware", device['device']['hardware'])
+            print_data(term_cols, "Port", port['port_label_short'])
+            print_data(term_cols, "", "%s/device/device=%s/tab=port/port=%s/" %
                 (params['base_url'], port['device_id'], port['port_id']))
-            print_data("Description", port['ifAlias'])
-            print_data("Port status", "%s (Admin) / %s (Oper)" %
+            print_data(term_cols, "Description", port['ifAlias'])
+            print_data(term_cols, "Port status", "%s (Admin) / %s (Oper)" %
                 (port['ifAdminStatus'], port['ifOperStatus']))
-            print_data("Last change", port['ifLastChange'])
-            print_data("Speed", port['ifHighSpeed'], "Mbps")
-            print_data("Duplex", port['ifDuplex'])
-            print_data("MTU", port['ifMtu'])
+            print_data(term_cols, "Last change", port['ifLastChange'])
+            print_data(term_cols, "Speed", port['ifHighSpeed'], "Mbps")
+            print_data(term_cols, "Duplex", port['ifDuplex'])
+            print_data(term_cols, "MTU", port['ifMtu'])
             for ip in address['addresses']:
-                print_data("IP address", "%s/%s" % (ip['ipv4_address'],ip['ipv4_prefixlen']))
+                print_data(term_cols, "IP address", "%s/%s" % (ip['ipv4_address'],ip['ipv4_prefixlen']))
 
             for ip6 in address6['addresses']:
-                print_data("IPv6 address", "%s/%s" % (ip6['ipv6_compressed'],ip6['ipv6_prefixlen']))
-            print_data("Input rate", port['ifInOctets_rate'], "octets")
-            print_data("Output rate", port['ifOutOctets_rate'], "octets")
-            print_data("Input errors rate", port['ifInErrors_rate'])
-            print_data("Output errors rate", port['ifOutErrors_rate'])
+                print_data(term_cols, "IPv6 address", "%s/%s" % (ip6['ipv6_compressed'],ip6['ipv6_prefixlen']))
+            print_data(term_cols, "Input rate", port['ifInOctets_rate'], "octets")
+            print_data(term_cols, "Output rate", port['ifOutOctets_rate'], "octets")
+            print_data(term_cols, "Input errors rate", port['ifInErrors_rate'])
+            print_data(term_cols, "Output errors rate", port['ifOutErrors_rate'])
 
             print("(0m" + "q" * 20 + "v" + "q" * (term_cols - 23) + "j(B")
 
+def search_devices(args):
+    if args.field == "location":
+        args.field = "location_text"
+
+    for instance, params in cfg['instances'].items():
+        data = call_api(params, 'devices/?%s=%s' % (args.field, args.string))
+
+        if data['count'] < 1:
+            print("No device found for description %s on instance %s" %
+                (args.string, instance))
+            return
+
+        for device in data['devices'].values():
+            if device['disabled'] == "1": continue
+
+            term_cols = getattr(shutil.get_terminal_size((80, 20)), 'columns')
+            print("(0l" + "q" * 20 + "w" + "q" * (term_cols - 23) + "k(B")
+            print_data(term_cols, "Device", device['hostname'])
+            print_data(term_cols, "", "%s/device/device=%s" %
+                (params['base_url'], device['device_id']))
+            print_data(term_cols, "System name", device['sysName'])
+            print_data(term_cols, "Hardware", " ".join([device['vendor'] or "", device['hardware'] or ""]))
+            print_data(term_cols, "Software version",
+              " ".join([device['os_text'],
+                        device['version'] or ""]))
+            if device['features']:
+                print_data(term_cols, "Features", device['features'])
+            print_data(term_cols, "Serial number", device['serial'])
+            print_data(term_cols, "Location", device['location'])
+            print("(0m" + "q" * 20 + "v" + "q" * (term_cols - 23) + "j(B")
+
 # Argument parsing
 parser = argparse.ArgumentParser()
 subparsers = parser.add_subparsers(help='Action to perform',dest='action')
+
 parser_search_port_by_descr = subparsers.add_parser('search_ports', help="Search ports by description")
 parser_search_port_by_descr.add_argument('string', type=str, help="String to search")
 
+parser_search_device = subparsers.add_parser('search_devices', help="Search devices")
+
+parser_search_device.add_argument('field', choices=['sysname', 'location', 'hardware', 'serial'], help="Field to use for search")
+
+parser_search_device.add_argument('string', type=str, help="String to search")
+
 args = parser.parse_args()
 globals()[args.action](args)