diff --git a/sys/dev/usb/usbdi.h b/sys/dev/usb/usbdi.h
index 15780bec669..7fb44699f96 100644
--- a/sys/dev/usb/usbdi.h
+++ b/sys/dev/usb/usbdi.h
@@ -207,42 +207,21 @@ struct usb_attach_arg {
 
 #elif defined(__FreeBSD__)
 /* FreeBSD needs values less than zero */
-/* for the moment disabled
-#define UMATCH_VENDOR_PRODUCT_REV			-14
-#define UMATCH_VENDOR_PRODUCT				-13
-#define UMATCH_VENDOR_DEVCLASS_DEVPROTO			-12
-#define UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO		-11
-#define UMATCH_DEVCLASS_DEVSUBCLASS			-10
-#define UMATCH_VENDOR_PRODUCT_REV_CONF_IFACE		 -9
-#define UMATCH_VENDOR_PRODUCT_CONF_IFACE		 -8
-#define UMATCH_VENDOR_IFACESUBCLASS_IFACEPROTO		 -7
-#define UMATCH_VENDOR_IFACESUBCLASS			 -6
-#define UMATCH_IFACECLASS_IFACESUBCLASS_IFACEPROTO	 -5
-#define UMATCH_IFACECLASS_IFACESUBCLASS			 -4
-#define UMATCH_IFACECLASS				 -3
-#define UMATCH_IFACECLASS_GENERIC			 -2
-#define UMATCH_GENERIC					 -1
-#define UMATCH_NONE				      ENXIO
-
-* For the moment we use Yes/No answers with appropriate
-* sorting in the config file
-*/
-#define UMATCH_VENDOR_PRODUCT_REV			0
-#define UMATCH_VENDOR_PRODUCT				0
-#define UMATCH_VENDOR_DEVCLASS_DEVPROTO			0
-#define UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO		0
-#define UMATCH_DEVCLASS_DEVSUBCLASS			0
-#define UMATCH_VENDOR_PRODUCT_REV_CONF_IFACE		0
-#define UMATCH_VENDOR_PRODUCT_CONF_IFACE		0
-#define UMATCH_VENDOR_IFACESUBCLASS_IFACEPROTO		0
-#define UMATCH_VENDOR_IFACESUBCLASS			0
-#define UMATCH_IFACECLASS_IFACESUBCLASS_IFACEPROTO	0
-#define UMATCH_IFACECLASS_IFACESUBCLASS			0
-#define UMATCH_IFACECLASS				0
-#define UMATCH_IFACECLASS_GENERIC			0
-#define UMATCH_GENERIC					0
-#define UMATCH_NONE				      ENXIO
-
+#define UMATCH_VENDOR_PRODUCT_REV			(-10)
+#define UMATCH_VENDOR_PRODUCT				(-20)
+#define UMATCH_VENDOR_DEVCLASS_DEVPROTO			(-30)
+#define UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO		(-40)
+#define UMATCH_DEVCLASS_DEVSUBCLASS			(-50)
+#define UMATCH_VENDOR_PRODUCT_REV_CONF_IFACE		(-60)
+#define UMATCH_VENDOR_PRODUCT_CONF_IFACE		(-70)
+#define UMATCH_VENDOR_IFACESUBCLASS_IFACEPROTO		(-80)
+#define UMATCH_VENDOR_IFACESUBCLASS			(-90)
+#define UMATCH_IFACECLASS_IFACESUBCLASS_IFACEPROTO	(-100)
+#define UMATCH_IFACECLASS_IFACESUBCLASS			(-110)
+#define UMATCH_IFACECLASS				(-120)
+#define UMATCH_IFACECLASS_GENERIC			(-130)
+#define UMATCH_GENERIC					(-140)
+#define UMATCH_NONE					(ENXIO)
 
 #endif