diff --git a/etc/usbd.conf b/etc/usbd.conf
index a91a69c8ec44..8d0adc7cf3c1 100644
--- a/etc/usbd.conf
+++ b/etc/usbd.conf
@@ -6,8 +6,8 @@
 # the device detaches and reappears as something new and shiny.
 #
 device "ActiveWire board, firmware download"
-   product 0x0100
    vendor  0x0854
+   product 0x0100
    release 0x0000
    attach "/usr/local/bin/ezdownload -f /usr/local/share/usb/firmware/0854.0100.0_01.hex"
 
@@ -16,8 +16,8 @@ device "ActiveWire board, firmware download"
 # the interfaces is not yet exported.
 #
 device "USB Zip drive"
-   product 0x0001
    vendor  0x059b
+   product 0x0001
    release 0x0100
    attach "/usr/bin/camcontrol rescan bus 0"
 
@@ -25,8 +25,8 @@ device "USB Zip drive"
 # id (and the device name of course) with the data for your mouse.
 #
 device "Logitech N48 USB mouse"
-   product 0xc001
    vendor 0x046d
+   product 0xc001
    attach "/usr/sbin/moused -p /dev/ums0 -I /var/run/moused.ums0.pid"
 
 # The fallthrough entry: Nothing is specified, nothing is done.  And it isn't
diff --git a/usr.sbin/usbd/usbd.c b/usr.sbin/usbd/usbd.c
index 69cd47c61c35..33e29f2bda14 100644
--- a/usr.sbin/usbd/usbd.c
+++ b/usr.sbin/usbd/usbd.c
@@ -115,8 +115,8 @@ event_name_t event_names[] = {
 
 #define DEVICE_FIELD		0	/* descriptive field */
 
-#define PRODUCT_FIELD		1	/* selective fields */
-#define VENDOR_FIELD		2
+#define VENDOR_FIELD		1	/* selective fields */
+#define PRODUCT_FIELD		2
 #define RELEASE_FIELD		3
 #define CLASS_FIELD		4
 #define SUBCLASS_FIELD		5
@@ -129,8 +129,8 @@ event_name_t event_names[] = {
 typedef struct action_s {
 	char 	*name;		/* descriptive string */
 
-	int	product;	/* selection criteria */
-	int	vendor;
+	int	vendor;	/* selection criteria */
+	int	product;
 	int	release;
 	int	class;
 	int	subclass;
@@ -152,8 +152,8 @@ typedef int (*config_field_fn)	__P((action_t *action, char *args,
 					char **trail));
 
 int set_device_field(action_t *action, char *args, char **trail);
-int set_product_field(action_t *action, char *args, char **trail);
 int set_vendor_field(action_t *action, char *args, char **trail);
+int set_product_field(action_t *action, char *args, char **trail);
 int set_release_field(action_t *action, char *args, char **trail);
 int set_class_field(action_t *action, char *args, char **trail);
 int set_subclass_field(action_t *action, char *args, char **trail);
@@ -171,8 +171,8 @@ typedef struct config_field_s {
 config_field_t config_fields[] = {
 	{DEVICE_FIELD,		"device",	set_device_field},
 
-	{PRODUCT_FIELD,		"product",	set_product_field},
 	{VENDOR_FIELD,		"vendor",	set_vendor_field},
+	{PRODUCT_FIELD,		"product",	set_product_field},
 	{RELEASE_FIELD,		"release",	set_release_field},
 	{CLASS_FIELD,		"class",	set_class_field},
 	{SUBCLASS_FIELD,	"subclass",	set_subclass_field},
@@ -324,16 +324,16 @@ set_device_field(action_t *action, char *args, char **trail)
 	return(get_string(args, &action->name, trail));
 }
 int
-set_product_field(action_t *action, char *args, char **trail)
-{
-	return(get_integer(args, &action->product, trail));
-}
-int
 set_vendor_field(action_t *action, char *args, char **trail)
 {
 	return(get_integer(args, &action->vendor, trail));
 }
 int
+set_product_field(action_t *action, char *args, char **trail)
+{
+	return(get_integer(args, &action->product, trail));
+}
+int
 set_release_field(action_t *action, char *args, char **trail)
 {
 	return(get_integer(args, &action->release, trail));
@@ -530,9 +530,9 @@ print_event(struct usb_event *event)
 		timespec->tv_sec, timespec->tv_nsec,
 		devinfo->product, devinfo->vendor);
 
-	printf("  prdct=0x%04x vndr=0x%04x rlse=0x%04x "
+	printf("  vndr=0x%04x prdct=0x%04x rlse=0x%04x "
 	       "clss=0x%04x subclss=0x%04x prtcl=0x%04x\n",
-	       devinfo->productNo, devinfo->vendorNo, devinfo->releaseNo,
+	       devinfo->vendorNo, devinfo->productNo, devinfo->releaseNo,
 	       devinfo->class, devinfo->subclass, devinfo->protocol);
 }
 
@@ -552,10 +552,10 @@ print_action(action_t *action, int i)
 	    action->subclass != WILDCARD_INT ||
 	    action->protocol != WILDCARD_INT)
 		printf(" ");
-	if (action->product != WILDCARD_INT)
-		printf(" prdct=0x%04x", action->product);
 	if (action->vendor != WILDCARD_INT)
 		printf(" vndr=0x%04x", action->vendor);
+	if (action->product != WILDCARD_INT)
+		printf(" prdct=0x%04x", action->product);
 	if (action->release != WILDCARD_INT)
 		printf(" rlse=0x%04x", action->release);
 	if (action->class != WILDCARD_INT)
@@ -564,8 +564,8 @@ print_action(action_t *action, int i)
 		printf(" subclss=0x%04x", action->subclass);
 	if (action->protocol != WILDCARD_INT)
 		printf(" prtcl=0x%04x", action->protocol);
-	if (action->product != WILDCARD_INT ||
-	    action->vendor != WILDCARD_INT ||
+	if (action->vendor != WILDCARD_INT ||
+	    action->product != WILDCARD_INT ||
 	    action->release != WILDCARD_INT ||
 	    action->class != WILDCARD_INT ||
 	    action->subclass != WILDCARD_INT ||
@@ -598,10 +598,10 @@ find_action(struct usb_device_info *devinfo)
 	action_t *action;
 
 	STAILQ_FOREACH(action, &actions, next) {
-		if ((action->product == WILDCARD_INT ||
-		     action->product == devinfo->productNo) &&
-		    (action->vendor == WILDCARD_INT ||
+		if ((action->vendor == WILDCARD_INT ||
 		     action->vendor == devinfo->vendorNo) &&
+		    (action->product == WILDCARD_INT ||
+		     action->product == devinfo->productNo) &&
 		    (action->release == WILDCARD_INT ||
 		     action->release == devinfo->releaseNo) &&
 		    (action->class == WILDCARD_INT ||