diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index f373bcdfbc4d..48cb409c4fd3 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs.h,v 1.467 2007/05/07 07:29:19 xtraeme Exp $	*/
+/* ??? */
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.465 2007/05/07 07:29:03 xtraeme Exp
+ *	NetBSD: usbdevs,v 1.466 2007/05/20 05:05:06 dogcow Exp
  */
 
 /*
@@ -416,11 +416,15 @@
 #define	USB_VENDOR_AIRPRIME	0x0f3d		/* AirPrime, Incorporated */
 #define	USB_VENDOR_VTECH	0x0f88		/* VTech */
 #define	USB_VENDOR_FALCOM	0x0f94		/* Falcom Wireless Communications GmbH */
+#define	USB_VENDOR_DYNASTREAM	0x0fcf		/* Dynastream Innovations */
 #define	USB_VENDOR_QUALCOMM	0x1004		/* Qualcomm */
 #define	USB_VENDOR_GIGABYTE	0x1044		/* GIGABYTE */
 #define	USB_VENDOR_MOTOROLA	0x1063		/* Motorola */
 #define	USB_VENDOR_CCYU	0x1065		/* CCYU Technology */
+#define	USB_VENDOR_SILABS2	0x10a6		/* SILABS2 */
+#define	USB_VENDOR_USI	0x10ab		/* USI */
 #define	USB_VENDOR_PLX	0x10b5		/* PLX */
+#define	USB_VENDOR_SILABS	0x10c4		/* Silicon Labs */
 #define	USB_VENDOR_ASANTE	0x10bd		/* Asante */
 #define	USB_VENDOR_JRC	0x1145		/* Japan Radio Company */
 #define	USB_VENDOR_SPHAIRON	0x114b		/* Sphairon Access Systems GmbH */
@@ -437,6 +441,7 @@
 #define	USB_VENDOR_AINCOMM	0x12fd		/* Aincomm */
 #define	USB_VENDOR_MOBILITY	0x1342		/* Mobility */
 #define	USB_VENDOR_DICKSMITH	0x1371		/* Dick Smith Electronics */
+#define	USB_VENDOR_BALTECH	0x13ad		/* Baltech */
 #define	USB_VENDOR_CISCOLINKSYS	0x13b1		/* Cisco-Linksys */
 #define	USB_VENDOR_SHARK	0x13d2		/* Shark */
 #define	USB_VENDOR_NOVATEL2	0x1410		/* Novatel */
@@ -456,6 +461,7 @@
 #define	USB_VENDOR_ACTIONTEC	0x1668		/* Actiontec Electronics */
 #define	USB_VENDOR_GIGASET	0x1690		/* Gigaset */
 #define	USB_VENDOR_ANYDATA	0x16d5		/* AnyDATA Inc. */
+#define	USB_VENDOR_JABLOTRON	0x16d6		/* Jablotron */
 #define	USB_VENDOR_AMIT	0x18c5		/* AMIT */
 #define	USB_VENDOR_QCOM	0x18e8		/* Qcom */
 #define	USB_VENDOR_LINKSYS3	0x1915		/* Linksys */
@@ -689,6 +695,9 @@
 /* B&B Electronics products */
 #define	USB_PRODUCT_BBELECTRONICS_USOTL4	0xAC01		/* uLinks RS-422/485 */
 
+/* Baltech products */
+#define	USB_PRODUCT_BALTECH_CARDREADER	0x9999		/* Card reader */
+
 /* Belkin products */
 /*product BELKIN F5U111		0x????	F5U111 Ethernet adapter*/
 #define	USB_PRODUCT_BELKIN2_F5U002	0x0002		/* F5U002 Parallel printer adapter */
@@ -886,6 +895,9 @@
 #define	USB_PRODUCT_DLINK_DSB650TX2	0x4102		/* 10/100 ethernet adapter */
 #define	USB_PRODUCT_DLINK_DSB650	0xabc1		/* 10/100 ethernet adapter */
 
+/* Dynastream Innovations */
+#define	USB_PRODUCT_DYNASTREAM_ANTDEVBOARD	0x1003		/* ANT dev board */
+
 /* eGalax Products */
 #define	USB_PRODUCT_EGALAX_TPANEL	0x0001		/* Touch Panel */
 #define	USB_PRODUCT_EGALAX_TPANEL2	0x0002		/* Touch Panel */
@@ -1199,6 +1211,9 @@
 #define	USB_PRODUCT_IRIVER_IFP_3XX	0x1103		/* iFP-3xx */
 #define	USB_PRODUCT_IRIVER_IFP_5XX	0x1105		/* iFP-5xx */
 
+/* Jablotron products */
+#define	USB_PRODUCT_JABLOTRON_PC60B	0x0001		/* PC-60B */
+
 /* Jaton products */
 #define	USB_PRODUCT_JATON_EDA	0x5704		/* Ethernet Device Adapter */
 
@@ -1876,6 +1891,21 @@
 /* Silicom products */
 #define	USB_PRODUCT_SILICOM_U2E	0x0001		/* U2E */
 
+/* Silicon Labs products */
+#define	USB_PRODUCT_SILABS_POLOLU	0x803b		/* Pololu Serial */
+#define	USB_PRODUCT_SILABS_ARGUSISP	0x8066		/* Argussoft ISP */
+#define	USB_PRODUCT_SILABS_CRUMB128	0x807a		/* Crumb128 */
+#define	USB_PRODUCT_SILABS_DEGREECONT	0x80ca		/* Degree Controls */
+#define	USB_PRODUCT_SILABS_SUNNTO	0x80f6		/* Suunto sports */
+#define	USB_PRODUCT_SILABS_DESKTOPMOBILE	0x813d		/* Burnside Desktop mobile */
+#define	USB_PRODUCT_SILABS_IPLINK1220	0x815e		/* IP-Link 1220 */
+#define	USB_PRODUCT_SILABS_LIPOWSKY_JTAG	0x81c8		/* Lipowsky Baby-JTAG */
+#define	USB_PRODUCT_SILABS_LIPOWSKY_LIN	0x81e2		/* Lipowsky Baby-LIN */
+#define	USB_PRODUCT_SILABS_LIPOWSKY_HARP	0x8218		/* Lipowsky HARP-1 */
+#define	USB_PRODUCT_SILABS2_DCU11CLONE	0xaa26		/* DCU-11 clone */
+#define	USB_PRODUCT_SILABS_CP210X_1	0xea60		/* CP210x Serial */
+#define	USB_PRODUCT_SILABS_CP210X_2	0xea61		/* CP210x Serial */
+
 /* Silicon Portals Inc. */
 #define	USB_PRODUCT_SILICONPORTALS_YAPPH_NF	0x0200		/* YAP Phone (no firmware) */
 #define	USB_PRODUCT_SILICONPORTALS_YAPPHONE	0x0201		/* YAP Phone */
@@ -2057,6 +2087,9 @@
 /* U.S. Robotics products */
 #define	USB_PRODUCT_USR_USR1120	0x00eb		/* USR1120 WLAN */
 
+/* USI products */
+#define	USB_PRODUCT_USI_MC60	0x10c5		/* MC60 Serial */
+
 /* GNU Radio USRP */
 #define	USB_PRODUCT_USRP_USRPv2	0x0002		/* USRP Revision 2 */
 
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index c936232acabf..4cd7c19fbcab 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs_data.h,v 1.468 2007/05/07 07:29:20 xtraeme Exp $	*/
+/* ??? */
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.465 2007/05/07 07:29:03 xtraeme Exp
+ *	NetBSD: usbdevs,v 1.466 2007/05/20 05:05:06 dogcow Exp
  */
 
 /*
@@ -1437,6 +1437,10 @@ const struct usb_vendor usb_vendors[] = {
 	    USB_VENDOR_FALCOM,
 	    "Falcom Wireless Communications GmbH",
 	},
+	{
+	    USB_VENDOR_DYNASTREAM,
+	    "Dynastream Innovations",
+	},
 	{
 	    USB_VENDOR_QUALCOMM,
 	    "Qualcomm",
@@ -1453,10 +1457,22 @@ const struct usb_vendor usb_vendors[] = {
 	    USB_VENDOR_CCYU,
 	    "CCYU Technology",
 	},
+	{
+	    USB_VENDOR_SILABS2,
+	    "SILABS2",
+	},
+	{
+	    USB_VENDOR_USI,
+	    "USI",
+	},
 	{
 	    USB_VENDOR_PLX,
 	    "PLX",
 	},
+	{
+	    USB_VENDOR_SILABS,
+	    "Silicon Labs",
+	},
 	{
 	    USB_VENDOR_ASANTE,
 	    "Asante",
@@ -1521,6 +1537,10 @@ const struct usb_vendor usb_vendors[] = {
 	    USB_VENDOR_DICKSMITH,
 	    "Dick Smith Electronics",
 	},
+	{
+	    USB_VENDOR_BALTECH,
+	    "Baltech",
+	},
 	{
 	    USB_VENDOR_CISCOLINKSYS,
 	    "Cisco-Linksys",
@@ -1597,6 +1617,10 @@ const struct usb_vendor usb_vendors[] = {
 	    USB_VENDOR_ANYDATA,
 	    "AnyDATA Inc.",
 	},
+	{
+	    USB_VENDOR_JABLOTRON,
+	    "Jablotron",
+	},
 	{
 	    USB_VENDOR_AMIT,
 	    "AMIT",
@@ -1714,7 +1738,7 @@ const struct usb_vendor usb_vendors[] = {
 	    "GNU Radio USRP",
 	},
 };
-const int usb_nvendors = 417;
+const int usb_nvendors = 423;
 
 const struct usb_product usb_products[] = {
 	{
@@ -2185,6 +2209,10 @@ const struct usb_product usb_products[] = {
 	    USB_VENDOR_BBELECTRONICS, USB_PRODUCT_BBELECTRONICS_USOTL4,
 	    "uLinks RS-422/485",
 	},
+	{
+	    USB_VENDOR_BALTECH, USB_PRODUCT_BALTECH_CARDREADER,
+	    "Card reader",
+	},
 	{
 	    USB_VENDOR_BELKIN2, USB_PRODUCT_BELKIN2_F5U002,
 	    "F5U002 Parallel printer adapter",
@@ -2693,6 +2721,10 @@ const struct usb_product usb_products[] = {
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650,
 	    "10/100 ethernet adapter",
 	},
+	{
+	    USB_VENDOR_DYNASTREAM, USB_PRODUCT_DYNASTREAM_ANTDEVBOARD,
+	    "ANT dev board",
+	},
 	{
 	    USB_VENDOR_EGALAX, USB_PRODUCT_EGALAX_TPANEL,
 	    "Touch Panel",
@@ -3545,6 +3577,10 @@ const struct usb_product usb_products[] = {
 	    USB_VENDOR_IRIVER, USB_PRODUCT_IRIVER_IFP_5XX,
 	    "iFP-5xx",
 	},
+	{
+	    USB_VENDOR_JABLOTRON, USB_PRODUCT_JABLOTRON_PC60B,
+	    "PC-60B",
+	},
 	{
 	    USB_VENDOR_JATON, USB_PRODUCT_JATON_EDA,
 	    "Ethernet Device Adapter",
@@ -5373,6 +5409,58 @@ const struct usb_product usb_products[] = {
 	    USB_VENDOR_SILICOM, USB_PRODUCT_SILICOM_U2E,
 	    "U2E",
 	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_POLOLU,
+	    "Pololu Serial",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_ARGUSISP,
+	    "Argussoft ISP",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_CRUMB128,
+	    "Crumb128",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_DEGREECONT,
+	    "Degree Controls",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_SUNNTO,
+	    "Suunto sports",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_DESKTOPMOBILE,
+	    "Burnside Desktop mobile",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_IPLINK1220,
+	    "IP-Link 1220",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_LIPOWSKY_JTAG,
+	    "Lipowsky Baby-JTAG",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_LIPOWSKY_LIN,
+	    "Lipowsky Baby-LIN",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_LIPOWSKY_HARP,
+	    "Lipowsky HARP-1",
+	},
+	{
+	    USB_VENDOR_SILABS2, USB_PRODUCT_SILABS2_DCU11CLONE,
+	    "DCU-11 clone",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_CP210X_1,
+	    "CP210x Serial",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_CP210X_2,
+	    "CP210x Serial",
+	},
 	{
 	    USB_VENDOR_SILICONPORTALS, USB_PRODUCT_SILICONPORTALS_YAPPH_NF,
 	    "YAP Phone (no firmware)",
@@ -5765,6 +5853,10 @@ const struct usb_product usb_products[] = {
 	    USB_VENDOR_USR, USB_PRODUCT_USR_USR1120,
 	    "USR1120 WLAN",
 	},
+	{
+	    USB_VENDOR_USI, USB_PRODUCT_USI_MC60,
+	    "MC60 Serial",
+	},
 	{
 	    USB_VENDOR_USRP, USB_PRODUCT_USRP_USRPv2,
 	    "USRP Revision 2",
@@ -5982,4 +6074,4 @@ const struct usb_product usb_products[] = {
 	    "Scorpion-980N keyboard",
 	},
 };
-const int usb_nproducts = 1066;
+const int usb_nproducts = 1083;