diff --git a/usr.sbin/pciconf/pciconf.c b/usr.sbin/pciconf/pciconf.c
index 47b8f96422de..878b8d17b7e2 100644
--- a/usr.sbin/pciconf/pciconf.c
+++ b/usr.sbin/pciconf/pciconf.c
@@ -261,8 +261,8 @@ list_devs(const char *name, int verbose, int bars, int bridge, int caps,
 			return;
 		}
 		for (p = conf; p < &conf[pc.num_matches]; p++) {
-			printf("%s%d@pci%d:%d:%d:%d:\tclass=0x%06x card=0x%08x "
-			    "chip=0x%08x rev=0x%02x hdr=0x%02x\n",
+			printf("%s%d@pci%d:%d:%d:%d:\tclass=0x%06x subvendor=0x%04x subdevice=0x%04x "
+			    "vendor=0x%04x device=0x%04x rev=0x%02x hdr=0x%02x\n",
 			    *p->pd_name ? p->pd_name :
 			    "none",
 			    *p->pd_name ? (int)p->pd_unit :
@@ -270,8 +270,8 @@ list_devs(const char *name, int verbose, int bars, int bridge, int caps,
 			    p->pc_sel.pc_bus, p->pc_sel.pc_dev,
 			    p->pc_sel.pc_func, (p->pc_class << 16) |
 			    (p->pc_subclass << 8) | p->pc_progif,
-			    (p->pc_subdevice << 16) | p->pc_subvendor,
-			    (p->pc_device << 16) | p->pc_vendor,
+			    p->pc_subdevice, p->pc_subvendor,
+			    p->pc_device,  p->pc_vendor,
 			    p->pc_revid, p->pc_hdr);
 			if (verbose)
 				list_verbose(p);