diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 518d8cd5a51a..e49a58167223 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs.h,v 1.474 2007/06/22 16:37:46 itohy Exp $	*/
+/*	$NetBSD: usbdevs.h,v 1.475 2007/06/24 10:07:05 veego Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.473 2007/06/22 16:32:38 itohy Exp
+ *	NetBSD: usbdevs,v 1.475 2007/06/24 10:02:45 veego Exp
  */
 
 /*
@@ -100,6 +100,7 @@
 #define	USB_VENDOR_DIAMOND2	0x045a		/* Diamond (Supra) */
 #define	USB_VENDOR_MICROSOFT	0x045e		/* Microsoft */
 #define	USB_VENDOR_PRIMAX	0x0461		/* Primax Electronics */
+#define	USB_VENDOR_MGE	0x0463		/* MGE UPS Systems */
 #define	USB_VENDOR_AMP	0x0464		/* AMP */
 #define	USB_VENDOR_CHERRY	0x046a		/* Cherry Mikroschalter */
 #define	USB_VENDOR_MEGATRENDS	0x046b		/* American Megatrends */
@@ -393,6 +394,7 @@
 #define	USB_VENDOR_ASIX	0x0b95		/* ASIX Electronics */
 #define	USB_VENDOR_O2MICRO	0x0b97		/* O2 Micro */
 #define	USB_VENDOR_USR	0x0baf		/* U.S. Robotics */
+#define	USB_VENDOR_AMBIT	0x0bb2		/* Ambit Microsystems */
 #define	USB_VENDOR_REALTEK	0x0bda		/* Realtek */
 #define	USB_VENDOR_ADDONICS2	0x0bf6		/* Addonics Technology */
 #define	USB_VENDOR_AGATE	0x0c08		/* Agate Technologies */
@@ -408,8 +410,10 @@
 #define	USB_VENDOR_ACDC	0x0d7e		/* American Computer & Digital Components */
 #define	USB_VENDOR_CMEDIA	0x0d8c		/* C-Media Electronics Inc. */
 #define	USB_VENDOR_MSI	0x0db0		/* Micro Star */
+#define	USB_VENDOR_ELCON	0x0db7		/* ELCON Systemtechnik */
 #define	USB_VENDOR_SITECOMEU	0x0df6		/* Sitecom Europe */
 #define	USB_VENDOR_HAWKING	0x0e66		/* Hawking */
+#define	USB_VENDOR_GMATE	0x0e7e		/* G.Mate, Inc */
 #define	USB_VENDOR_OTI	0x0ea0		/* Ours Technology */
 #define	USB_VENDOR_PILOTECH	0x0eaf		/* Pilotech */
 #define	USB_VENDOR_NOVATECH	0x0eb0		/* Nova Tech */
@@ -470,6 +474,7 @@
 #define	USB_VENDOR_GIGASET	0x1690		/* Gigaset */
 #define	USB_VENDOR_ANYDATA	0x16d5		/* AnyDATA Inc. */
 #define	USB_VENDOR_JABLOTRON	0x16d6		/* Jablotron */
+#define	USB_VENDOR_LINKSYS4	0x1737		/* Linksys */
 #define	USB_VENDOR_SENAO	0x1740		/* Senao */
 #define	USB_VENDOR_AMIT	0x18c5		/* AMIT */
 #define	USB_VENDOR_QCOM	0x18e8		/* Qcom */
@@ -535,6 +540,7 @@
 #define	USB_PRODUCT_ABOCOM_XX4	0x4004		/* XX4 */
 #define	USB_PRODUCT_ABOCOM_XX5	0x4007		/* XX5 */
 #define	USB_PRODUCT_ABOCOM_XX6	0x400b		/* XX6 */
+#define	USB_PRODUCT_ABOCOM_RTL8151	0x401a		/* RTL8151 */
 #define	USB_PRODUCT_ABOCOM_XX7	0x400c		/* XX7 */
 #define	USB_PRODUCT_ABOCOM_LCS8138TX	0x401a		/* LCS-8138TX */
 #define	USB_PRODUCT_ABOCOM_XX8	0x4102		/* XX8 */
@@ -555,6 +561,12 @@
 #define	USB_PRODUCT_ACCTON_SS1001	0x5046		/* SpeedStream Ethernet Adapter */
 #define	USB_PRODUCT_ACCTON_ZD1211B	0xe501		/* ZD1211B */
 
+/* Acer Communications & Multimedia products */
+#define	USB_PRODUCT_ACERCM_EP1427X2	0x0893		/* EP-1427X-2 Ethernet */
+
+/* Acer Labs products */
+#define	USB_PRODUCT_ACERLABS_M5632	0x5632		/* USB 2.0 Data Link */
+
 /* Acer Peripherals, Inc. products */
 #define	USB_PRODUCT_ACERP_ACERSCAN_C310U	0x12a6		/* Acerscan C310U */
 #define	USB_PRODUCT_ACERP_ACERSCAN_320U	0x2022		/* Acerscan 320U */
@@ -587,6 +599,7 @@
 #define	USB_PRODUCT_ADDONICS2_205	0xa001		/* Cable 205 */
 
 /* ADMtek products */
+#define	USB_PRODUCT_ADMTEK_PEGASUSII_4	0x07c2		/* AN986A Ethernet */
 #define	USB_PRODUCT_ADMTEK_PEGASUS	0x0986		/* AN986 USB Ethernet */
 #define	USB_PRODUCT_ADMTEK_PEGASUSII	0x8511		/* AN8511 USB Ethernet */
 #define	USB_PRODUCT_ADMTEK_PEGASUSII_2	0x8513		/* AN8513 Ethernet */
@@ -639,7 +652,10 @@
 #define	USB_PRODUCT_ALTEC_ASC495	0xff05		/* ASC495 Speakers */
 
 /* American Power Conversion products */
-#define	USB_PRODUCT_APC_UPSPRO500	0x0002		/* Back-UPS Pro 500 */
+#define	USB_PRODUCT_APC_UPS	0x0002		/* Uninterruptible Power Supply */
+
+/* Ambit Microsystems products */
+#define	USB_PRODUCT_AMBIT_NTL_250	0x6098		/* NTL 250 cable modem */
 
 /* AMIT products */
 #define	USB_PRODUCT_AMIT_CGWLUSB2GO	0x0002		/* CG-WLUSB2GO */
@@ -673,6 +689,7 @@
 
 /* ASIX Electronics products */
 #define	USB_PRODUCT_ASIX_AX88172	0x1720		/* AX88172 USB 2.0 10/100 Ethernet adapter */
+#define	USB_PRODUCT_ASIX_AX88178	0x1780		/* AX88178 USB 2.0 10/100 Ethernet adapter */
 #define	USB_PRODUCT_ASIX_AX88772	0x7720		/* AX88772 USB 2.0 10/100 Ethernet adapter */
 
 /* ASUSTeK computer products */
@@ -686,6 +703,7 @@
 #define	USB_PRODUCT_ATEN_UC1284	0x2001		/* Parallel printer adapter */
 #define	USB_PRODUCT_ATEN_UC10T	0x2002		/* 10Mbps ethernet adapter */
 #define	USB_PRODUCT_ATEN_UC232A	0x2008		/* Serial adapter */
+#define	USB_PRODUCT_ATEN_UC210T	0x2009		/* UC210T Ethernet adapter */
 #define	USB_PRODUCT_ATEN_DSB650C	0x4000		/* DSB-650C */
 
 /* ATI products */
@@ -733,7 +751,9 @@
 #define	USB_PRODUCT_BELKIN_UPS	0x0980		/* UPS */
 #define	USB_PRODUCT_BELKIN_F5U120	0x1203		/* F5U120-PC Hub */
 #define	USB_PRODUCT_BELKIN_ZD1211B	0x4050		/* ZD1211B */
+#define	USB_PRODUCT_BELKIN_F5D5055	0x5055		/* F5D5055 Ethernet adapter */
 #define	USB_PRODUCT_BELKIN_F5D7050	0x7050		/* F5D7050 54g USB Network Adapter */
+#define	USB_PRODUCT_BELKIN_F5D7051	0x7051		/* F5D7051 54g USB Network Adapter */
 #define	USB_PRODUCT_BELKIN_F5D7050A	0x705a		/* F5D705A 54g USB Network Adapter */
 #define	USB_PRODUCT_BELKIN_F5D7050C	0x705c		/* F5D705C 54g USB Network Adapter */
 #define	USB_PRODUCT_BELKIN_F5D9050V3	0x905b		/* F5D9050 ver 3 */
@@ -743,6 +763,7 @@
 #define	USB_PRODUCT_BILLIONTON_USBLP100	0x0987		/* USB100LP */
 #define	USB_PRODUCT_BILLIONTON_USBEL100	0x0988		/* USB100EL */
 #define	USB_PRODUCT_BILLIONTON_USBE100	0x8511		/* USBE100 */
+#define	USB_PRODUCT_BILLIONTON_USB2AR	0x90ff		/* USB2AR Ethernet */
 
 /* Broadcom products */
 #define	USB_PRODUCT_BROADCOM_BCM2033	0x2000		/* BCM2033 */
@@ -803,8 +824,8 @@
 #define	USB_PRODUCT_CHPRODUCTS_FLIGHTYOKE	0x00ff		/* Flight Sim Yoke */
 
 /* Cisco-Linksys products */
-#define	USB_PRODUCT_CISCOLINKSYS_WUSB54G	0x000d		/* RT2570 */
-#define	USB_PRODUCT_CISCOLINKSYS_WUSB54GP	0x0011		/* RT2570 */
+#define	USB_PRODUCT_CISCOLINKSYS_WUSB54G	0x000d		/* WUSB54G Wireless-G USB Network Adapter */
+#define	USB_PRODUCT_CISCOLINKSYS_WUSB54GP	0x0011		/* WUSB54GP Wireless-G USB Network Adapter */
 #define	USB_PRODUCT_CISCOLINKSYS_USB200MV2	0x0018		/* USB200M v2 */
 #define	USB_PRODUCT_CISCOLINKSYS_WUSB54GC	0x0020		/* WUSB54GC */
 #define	USB_PRODUCT_CISCOLINKSYS_WUSB54GR	0x0023		/* WUSB54GR */
@@ -913,6 +934,7 @@
 #define	USB_PRODUCT_DLINK_DWLG122	0x3c00		/* AirPlus G Wireless USB Adapter */
 #define	USB_PRODUCT_DLINK2_DWLG122C1	0x3c03		/* DWL-G122 rev C1 */
 #define	USB_PRODUCT_DLINK2_WUA1340	0x3c04		/* WUA-1340 */
+#define	USB_PRODUCT_DLINK_DUBE100B1	0x3c05		/* DUB-E100 rev B1 */
 #define	USB_PRODUCT_DLINK_DSB650C	0x4000		/* 10Mbps ethernet adapter */
 #define	USB_PRODUCT_DLINK_DSB650TX1	0x4001		/* 10/100 ethernet adapter */
 #define	USB_PRODUCT_DLINK_DSB650TX	0x4002		/* 10/100 ethernet adapter */
@@ -942,12 +964,16 @@
 #define	USB_PRODUCT_EIZO_HUB	0x0000		/* hub */
 #define	USB_PRODUCT_EIZO_MONITOR	0x0001		/* monitor */
 
+/* ELCON Systemtechnik products */
+#define	USB_PRODUCT_ELCON_PLAN	0x0002		/* Goldpfeil P-LAN */
+
 /* Elecom products */
 #define	USB_PRODUCT_ELECOM_MOUSE29UO	0x0002		/* mouse 29UO */
 #define	USB_PRODUCT_ELECOM_LDUSBTX0	0x200c		/* LD-USB/TX */
 #define	USB_PRODUCT_ELECOM_LDUSBTX1	0x4002		/* LD-USB/TX */
 #define	USB_PRODUCT_ELECOM_LDUSBLTX	0x4005		/* LD-USBL/TX */
 #define	USB_PRODUCT_ELECOM_LDUSBTX2	0x400b		/* LD-USB/TX */
+#define	USB_PRODUCT_ELECOM_LDUSB20	0x4010		/* LD-USB20 */
 #define	USB_PRODUCT_ELECOM_UCSGT	0x5003		/* UC-SGT serial adapter */
 #define	USB_PRODUCT_ELECOM_UCSGT0	0x5004		/* UC-SGT0 Serial */
 #define	USB_PRODUCT_ELECOM_LDUSBTX3	0xabc1		/* LD-USB/TX */
@@ -1052,6 +1078,7 @@
 #define	USB_PRODUCT_GENESYS_GL641USB2IDE	0x0702		/* GL641USB USB-IDE Bridge */
 
 /* GIGABYTE products */
+#define	USB_PRODUCT_GIGABYTE_GN54G	0x8001		/* GN-54G */
 #define	USB_PRODUCT_GIGABYTE_GNBR402W	0x8002		/* GN-BR402W */
 #define	USB_PRODUCT_GIGABYTE_GNWLBM101	0x8003		/* GN-WLBM101 */
 #define	USB_PRODUCT_GIGABYTE_GNWBKG	0x8007		/* GN-WBKG */
@@ -1061,10 +1088,14 @@
 /* Gigaset products */
 #define	USB_PRODUCT_GIGASET_RT2573	0x0722		/* RT2573 */
 
+/* G.Mate, Inc products */
+#define	USB_PRODUCT_GMATE_YP3X00	0x1001		/* YP3X00 PDA */
+
 /* GoHubs products */
 #define	USB_PRODUCT_GOHUBS_GOCOM232	0x1001		/* GoCOM232 Serial converter */
 
 /* Good Way Technology products */
+#define	USB_PRODUCT_GOODWAY_GWUSB2E	0x6200		/* GWUSB2E */
 #define	USB_PRODUCT_GOODWAY_RT2573	0xc019		/* RT2573 */
 
 /* Gravis products */
@@ -1229,6 +1260,7 @@
 #define	USB_PRODUCT_IODATA_USBETTX	0x0904		/* USB ETTX */
 #define	USB_PRODUCT_IODATA_USBETTXS	0x0913		/* USB ETTX */
 #define	USB_PRODUCT_IODATA_USBWNB11	0x0922		/* USB Airport WN-B11 */
+#define	USB_PRODUCT_IODATA_ETGUS2	0x0930		/* ETG-US2 */
 #define	USB_PRODUCT_IODATA_USBRSAQ	0x0a03		/* USB serial adapter USB-RSAQ1 */
 #define	USB_PRODUCT_IODATA_USBRSAQ5	0x0a0e		/* USB serial adapter USB-RSAQ5 */
 #define	USB_PRODUCT_IODATA2_USB2SC	0x0a09		/* USB2.0-SCSI Bridge USB2-SC */
@@ -1258,8 +1290,7 @@
 
 /* JVC products */
 #define	USB_PRODUCT_JVC_GR_DX95	0x000a		/* GR-DX95 */
-
-/* JVC products */
+#define	USB_PRODUCT_JVC_MP_PRX1	0x3008		/* MP-PRX1 Ethernet */
 #define	USB_PRODUCT_JVC_MP_XP7250_WL	0x3009		/* MP-XP7250 Builtin WLAN */
 
 /* Kawasaki products */
@@ -1357,12 +1388,11 @@
 #define	USB_PRODUCT_LINKSYS_WUSB11	0x2211		/* WUSB11 Wireless USB Network Adapter */
 #define	USB_PRODUCT_LINKSYS_WUSB11_25	0x2212		/* WUSB11 Wireless USB Network Adapter (version 2.5) */
 #define	USB_PRODUCT_LINKSYS_WUSB12_11	0x2213		/* WUSB12 802.11b v1.1 */
-#define	USB_PRODUCT_LINKSYS2_USB200M	0x2226		/* USB 2.0 10/100 ethernet controller */
 #define	USB_PRODUCT_LINKSYS_USB10TX2	0x400b		/* USB10TX */
 #define	USB_PRODUCT_LINKSYS2_WUSB11	0x2219		/* WUSB11 */
+#define	USB_PRODUCT_LINKSYS2_USB200M	0x2226		/* USB 2.0 10/100 ethernet controller */
 #define	USB_PRODUCT_LINKSYS3_WUSB11V28	0x2233		/* WUSB11-V28 */
-#define	USB_PRODUCT_CISCOLINKSYS_WUSB54G	0x000d		/* WUSB54G Wireless-G USB Network Adapter */
-#define	USB_PRODUCT_CISCOLINKSYS_WUSB54GP	0x0011		/* WUSB54GP Wireless-G USB Network Adapter */
+#define	USB_PRODUCT_LINKSYS4_USB1000	0x0039		/* USB1000 */
 
 /* Logitec products */
 #define	USB_PRODUCT_LOGITEC_LDR_H443SU2	0x0033		/* DVD Multi-plus unit LDR-H443SU2 */
@@ -1443,6 +1473,10 @@
 /* Metricom products */
 #define	USB_PRODUCT_METRICOM_RICOCHET_GS	0x0001		/* Ricochet GS */
 
+/* MGE UPS Systems */
+#define	USB_PRODUCT_MGE_UPS1	0x0001		/* MGE UPS SYSTEMS PROTECTIONCENTER 1 */
+#define	USB_PRODUCT_MGE_UPS2	0xffff		/* MGE UPS SYSTEMS PROTECTIONCENTER 2 */
+
 /* Micro Star International products */
 #define	USB_PRODUCT_MSI_BLUETOOTH	0x1967		/* Bluetooth USB Adapter */
 #define	USB_PRODUCT_MSI_MS6861	0x6861		/* MS-6861 */
@@ -1515,6 +1549,7 @@
 
 /* Mobility products */
 #define	USB_PRODUCT_MOBILITY_EA	0x0204		/* Ethernet Adapter */
+#define	USB_PRODUCT_MOBILITY_EASIDOCK	0x0304		/* EasiDock Ethernet */
 
 /* MosChip Semiconductor */
 #define	USB_PRODUCT_MOSCHIP_MCS7780	0x7780		/* Fast IrDA Adapter */
@@ -1527,6 +1562,8 @@
 #define	USB_PRODUCT_MOTOROLA_SB4100	0x4100		/* SB4100 USB Cable Modem */
 #define	USB_PRODUCT_MOTOROLA2_T720C	0x2822		/* T720c */
 #define	USB_PRODUCT_MOTOROLA2_A920	0x4002		/* A920 */
+#define	USB_PRODUCT_MOTOROLA2_USBLAN	0x600c		/* USBLAN */
+#define	USB_PRODUCT_MOTOROLA2_USBLAN2	0x6027		/* USBLAN */
 
 /* M-Systems products */
 #define	USB_PRODUCT_MSYSTEMS_DISKONKEY	0x0010		/* DiskOnKey */
@@ -1575,6 +1612,7 @@
 /* NetChip Technology Products */
 #define	USB_PRODUCT_NETCHIP_TURBOCONNECT	0x1080		/* Turbo-Connect */
 #define	USB_PRODUCT_NETCHIP_CLIK40	0xa140		/* Clik! 40 */
+#define	USB_PRODUCT_NETCHIP_ETHERNETGADGET	0xa4a2		/* Linux Ethernet/RNDIS gadget on pxa210/25x/26x */
 
 /* Netgear products */
 #define	USB_PRODUCT_NETGEAR_EA101	0x1001		/* Ethernet adapter */
@@ -1638,6 +1676,7 @@
 
 /* OQO */
 #define	USB_PRODUCT_OQO_WIFI01	0x0002		/* model 01 WiFi interface */
+#define	USB_PRODUCT_OQO_ETHER01PLUS	0x7720		/* model 01+ Ethernet */
 #define	USB_PRODUCT_OQO_ETHER01	0x8150		/* model 01 Ethernet interface */
 
 /* Ours Technology Inc. */
@@ -1803,7 +1842,8 @@
 #define	USB_PRODUCT_RATOC_REXUSB60	0xb000		/* USB serial adapter REX-USB60 */
 
 /* Realtek products */
-#define	USB_PRODUCT_REALTEK_RTL8150L	0x8150		/* Realtek RTL8150L USB-Ethernet Bridge */
+#define	USB_PRODUCT_REALTEK_RTL8150L	0x8150		/* RTL8150L USB-Ethernet Bridge */
+#define	USB_PRODUCT_REALTEK_RTL8151	0x8151		/* RTL8151 PNA */
 
 /* Research In Motion */
 #define	USB_PRODUCT_RIM_BLACKBERRY	0x0001		/* BlackBerry */
@@ -1915,6 +1955,7 @@
 
 /* Siemens Info products */
 #define	USB_PRODUCT_SIEMENS2_MC75	0x0034		/* Wireless Modules MC75 */
+#define	USB_PRODUCT_SIEMENS2_WL54G	0x3c06		/* 54g USB Network Adapter */
 
 /* Sierra Wireless products */
 #define	USB_PRODUCT_SIERRA_AIRCARD580	0x0112		/* Sierra Wireless AirCard 580 */
@@ -1933,9 +1974,11 @@
 #define	USB_PRODUCT_SIIG_MULTICARDREADER	0x0201		/* MULTICARDREADER */
 
 #define	USB_PRODUCT_SIIG2_US2308	0x0421		/* Serial */
+#define	USB_PRODUCT_SIIG2_USBTOETHER	0x0109		/* USB TO Ethernet */
 
 /* Silicom products */
 #define	USB_PRODUCT_SILICOM_U2E	0x0001		/* U2E */
+#define	USB_PRODUCT_SILICOM_GPE	0x0002		/* Psion Gold Port Ethernet */
 
 /* Silicon Labs products */
 #define	USB_PRODUCT_SILABS_POLOLU	0x803b		/* Pololu Serial */
@@ -1987,6 +2030,7 @@
 
 /* SOHOware products */
 #define	USB_PRODUCT_SOHOWARE_NUB100	0x9100		/* 10/100 USB Ethernet */
+#define	USB_PRODUCT_SOHOWARE_NUB110	0x9110		/* NUB110 Ethernet */
 
 /* SOLID YEAR products */
 #define	USB_PRODUCT_SOLIDYEAR_KEYBOARD	0x2101		/* Solid Year USB keyboard */
@@ -2253,3 +2297,4 @@
 #define	USB_PRODUCT_ZYXEL_AG225H	0x3409		/* AG-225H */
 #define	USB_PRODUCT_ZYXEL_M202	0x340a		/* M-202 */
 #define	USB_PRODUCT_ZYXEL_G220V2	0x340f		/* G-220 v2 */
+#define	USB_PRODUCT_ZYXEL_PRESTIGE	0x401a		/* Prestige */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 597268304548..c9e5d101b4da 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.475 2007/06/22 16:37:46 itohy Exp $	*/
+/*	$NetBSD: usbdevs_data.h,v 1.476 2007/06/24 10:07:05 veego Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.473 2007/06/22 16:32:38 itohy Exp
+ *	NetBSD: usbdevs,v 1.475 2007/06/24 10:02:45 veego Exp
  */
 
 /*
@@ -173,6 +173,10 @@ const struct usb_vendor usb_vendors[] = {
 	    USB_VENDOR_PRIMAX,
 	    "Primax Electronics",
 	},
+	{
+	    USB_VENDOR_MGE,
+	    "MGE UPS Systems",
+	},
 	{
 	    USB_VENDOR_AMP,
 	    "AMP",
@@ -1345,6 +1349,10 @@ const struct usb_vendor usb_vendors[] = {
 	    USB_VENDOR_USR,
 	    "U.S. Robotics",
 	},
+	{
+	    USB_VENDOR_AMBIT,
+	    "Ambit Microsystems",
+	},
 	{
 	    USB_VENDOR_REALTEK,
 	    "Realtek",
@@ -1405,6 +1413,10 @@ const struct usb_vendor usb_vendors[] = {
 	    USB_VENDOR_MSI,
 	    "Micro Star",
 	},
+	{
+	    USB_VENDOR_ELCON,
+	    "ELCON Systemtechnik",
+	},
 	{
 	    USB_VENDOR_SITECOMEU,
 	    "Sitecom Europe",
@@ -1413,6 +1425,10 @@ const struct usb_vendor usb_vendors[] = {
 	    USB_VENDOR_HAWKING,
 	    "Hawking",
 	},
+	{
+	    USB_VENDOR_GMATE,
+	    "G.Mate, Inc",
+	},
 	{
 	    USB_VENDOR_OTI,
 	    "Ours Technology",
@@ -1653,6 +1669,10 @@ const struct usb_vendor usb_vendors[] = {
 	    USB_VENDOR_JABLOTRON,
 	    "Jablotron",
 	},
+	{
+	    USB_VENDOR_LINKSYS4,
+	    "Linksys",
+	},
 	{
 	    USB_VENDOR_SENAO,
 	    "Senao",
@@ -1782,7 +1802,7 @@ const struct usb_vendor usb_vendors[] = {
 	    "GNU Radio USRP",
 	},
 };
-const int usb_nvendors = 434;
+const int usb_nvendors = 439;
 
 const struct usb_product usb_products[] = {
 	{
@@ -1873,6 +1893,10 @@ const struct usb_product usb_products[] = {
 	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX6,
 	    "XX6",
 	},
+	{
+	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_RTL8151,
+	    "RTL8151",
+	},
 	{
 	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX7,
 	    "XX7",
@@ -1941,6 +1965,14 @@ const struct usb_product usb_products[] = {
 	    USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_ZD1211B,
 	    "ZD1211B",
 	},
+	{
+	    USB_VENDOR_ACERCM, USB_PRODUCT_ACERCM_EP1427X2,
+	    "EP-1427X-2 Ethernet",
+	},
+	{
+	    USB_VENDOR_ACERLABS, USB_PRODUCT_ACERLABS_M5632,
+	    "USB 2.0 Data Link",
+	},
 	{
 	    USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_C310U,
 	    "Acerscan C310U",
@@ -2009,6 +2041,10 @@ const struct usb_product usb_products[] = {
 	    USB_VENDOR_ADDONICS2, USB_PRODUCT_ADDONICS2_205,
 	    "Cable 205",
 	},
+	{
+	    USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_4,
+	    "AN986A Ethernet",
+	},
 	{
 	    USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUS,
 	    "AN986 USB Ethernet",
@@ -2126,8 +2162,12 @@ const struct usb_product usb_products[] = {
 	    "ASC495 Speakers",
 	},
 	{
-	    USB_VENDOR_APC, USB_PRODUCT_APC_UPSPRO500,
-	    "Back-UPS Pro 500",
+	    USB_VENDOR_APC, USB_PRODUCT_APC_UPS,
+	    "Uninterruptible Power Supply",
+	},
+	{
+	    USB_VENDOR_AMBIT, USB_PRODUCT_AMBIT_NTL_250,
+	    "NTL 250 cable modem",
 	},
 	{
 	    USB_VENDOR_AMIT, USB_PRODUCT_AMIT_CGWLUSB2GO,
@@ -2189,6 +2229,10 @@ const struct usb_product usb_products[] = {
 	    USB_VENDOR_ASIX, USB_PRODUCT_ASIX_AX88172,
 	    "AX88172 USB 2.0 10/100 Ethernet adapter",
 	},
+	{
+	    USB_VENDOR_ASIX, USB_PRODUCT_ASIX_AX88178,
+	    "AX88178 USB 2.0 10/100 Ethernet adapter",
+	},
 	{
 	    USB_VENDOR_ASIX, USB_PRODUCT_ASIX_AX88772,
 	    "AX88772 USB 2.0 10/100 Ethernet adapter",
@@ -2225,6 +2269,10 @@ const struct usb_product usb_products[] = {
 	    USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC232A,
 	    "Serial adapter",
 	},
+	{
+	    USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC210T,
+	    "UC210T Ethernet adapter",
+	},
 	{
 	    USB_VENDOR_ATEN, USB_PRODUCT_ATEN_DSB650C,
 	    "DSB-650C",
@@ -2337,10 +2385,18 @@ const struct usb_product usb_products[] = {
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_ZD1211B,
 	    "ZD1211B",
 	},
+	{
+	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D5055,
+	    "F5D5055 Ethernet adapter",
+	},
 	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D7050,
 	    "F5D7050 54g USB Network Adapter",
 	},
+	{
+	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D7051,
+	    "F5D7051 54g USB Network Adapter",
+	},
 	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D7050A,
 	    "F5D705A 54g USB Network Adapter",
@@ -2369,6 +2425,10 @@ const struct usb_product usb_products[] = {
 	    USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USBE100,
 	    "USBE100",
 	},
+	{
+	    USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB2AR,
+	    "USB2AR Ethernet",
+	},
 	{
 	    USB_VENDOR_BROADCOM, USB_PRODUCT_BROADCOM_BCM2033,
 	    "BCM2033",
@@ -2515,11 +2575,11 @@ const struct usb_product usb_products[] = {
 	},
 	{
 	    USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSB54G,
-	    "RT2570",
+	    "WUSB54G Wireless-G USB Network Adapter",
 	},
 	{
 	    USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSB54GP,
-	    "RT2570",
+	    "WUSB54GP Wireless-G USB Network Adapter",
 	},
 	{
 	    USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_USB200MV2,
@@ -2781,6 +2841,10 @@ const struct usb_product usb_products[] = {
 	    USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_WUA1340,
 	    "WUA-1340",
 	},
+	{
+	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DUBE100B1,
+	    "DUB-E100 rev B1",
+	},
 	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650C,
 	    "10Mbps ethernet adapter",
@@ -2845,6 +2909,10 @@ const struct usb_product usb_products[] = {
 	    USB_VENDOR_EIZO, USB_PRODUCT_EIZO_MONITOR,
 	    "monitor",
 	},
+	{
+	    USB_VENDOR_ELCON, USB_PRODUCT_ELCON_PLAN,
+	    "Goldpfeil P-LAN",
+	},
 	{
 	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_MOUSE29UO,
 	    "mouse 29UO",
@@ -2865,6 +2933,10 @@ const struct usb_product usb_products[] = {
 	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX2,
 	    "LD-USB/TX",
 	},
+	{
+	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSB20,
+	    "LD-USB20",
+	},
 	{
 	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_UCSGT,
 	    "UC-SGT serial adapter",
@@ -3153,6 +3225,10 @@ const struct usb_product usb_products[] = {
 	    USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL641USB2IDE,
 	    "GL641USB USB-IDE Bridge",
 	},
+	{
+	    USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_GN54G,
+	    "GN-54G",
+	},
 	{
 	    USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_GNBR402W,
 	    "GN-BR402W",
@@ -3177,10 +3253,18 @@ const struct usb_product usb_products[] = {
 	    USB_VENDOR_GIGASET, USB_PRODUCT_GIGASET_RT2573,
 	    "RT2573",
 	},
+	{
+	    USB_VENDOR_GMATE, USB_PRODUCT_GMATE_YP3X00,
+	    "YP3X00 PDA",
+	},
 	{
 	    USB_VENDOR_GOHUBS, USB_PRODUCT_GOHUBS_GOCOM232,
 	    "GoCOM232 Serial converter",
 	},
+	{
+	    USB_VENDOR_GOODWAY, USB_PRODUCT_GOODWAY_GWUSB2E,
+	    "GWUSB2E",
+	},
 	{
 	    USB_VENDOR_GOODWAY, USB_PRODUCT_GOODWAY_RT2573,
 	    "RT2573",
@@ -3637,6 +3721,10 @@ const struct usb_product usb_products[] = {
 	    USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBWNB11,
 	    "USB Airport WN-B11",
 	},
+	{
+	    USB_VENDOR_IODATA, USB_PRODUCT_IODATA_ETGUS2,
+	    "ETG-US2",
+	},
 	{
 	    USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBRSAQ,
 	    "USB serial adapter USB-RSAQ1",
@@ -3697,6 +3785,10 @@ const struct usb_product usb_products[] = {
 	    USB_VENDOR_JVC, USB_PRODUCT_JVC_GR_DX95,
 	    "GR-DX95",
 	},
+	{
+	    USB_VENDOR_JVC, USB_PRODUCT_JVC_MP_PRX1,
+	    "MP-PRX1 Ethernet",
+	},
 	{
 	    USB_VENDOR_JVC, USB_PRODUCT_JVC_MP_XP7250_WL,
 	    "MP-XP7250 Builtin WLAN",
@@ -3973,10 +4065,6 @@ const struct usb_product usb_products[] = {
 	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_WUSB12_11,
 	    "WUSB12 802.11b v1.1",
 	},
-	{
-	    USB_VENDOR_LINKSYS2, USB_PRODUCT_LINKSYS2_USB200M,
-	    "USB 2.0 10/100 ethernet controller",
-	},
 	{
 	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TX2,
 	    "USB10TX",
@@ -3985,17 +4073,17 @@ const struct usb_product usb_products[] = {
 	    USB_VENDOR_LINKSYS2, USB_PRODUCT_LINKSYS2_WUSB11,
 	    "WUSB11",
 	},
+	{
+	    USB_VENDOR_LINKSYS2, USB_PRODUCT_LINKSYS2_USB200M,
+	    "USB 2.0 10/100 ethernet controller",
+	},
 	{
 	    USB_VENDOR_LINKSYS3, USB_PRODUCT_LINKSYS3_WUSB11V28,
 	    "WUSB11-V28",
 	},
 	{
-	    USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSB54G,
-	    "WUSB54G Wireless-G USB Network Adapter",
-	},
-	{
-	    USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSB54GP,
-	    "WUSB54GP Wireless-G USB Network Adapter",
+	    USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_USB1000,
+	    "USB1000",
 	},
 	{
 	    USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_LDR_H443SU2,
@@ -4241,6 +4329,14 @@ const struct usb_product usb_products[] = {
 	    USB_VENDOR_METRICOM, USB_PRODUCT_METRICOM_RICOCHET_GS,
 	    "Ricochet GS",
 	},
+	{
+	    USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS1,
+	    "MGE UPS SYSTEMS PROTECTIONCENTER 1",
+	},
+	{
+	    USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS2,
+	    "MGE UPS SYSTEMS PROTECTIONCENTER 2",
+	},
 	{
 	    USB_VENDOR_MSI, USB_PRODUCT_MSI_BLUETOOTH,
 	    "Bluetooth USB Adapter",
@@ -4453,6 +4549,10 @@ const struct usb_product usb_products[] = {
 	    USB_VENDOR_MOBILITY, USB_PRODUCT_MOBILITY_EA,
 	    "Ethernet Adapter",
 	},
+	{
+	    USB_VENDOR_MOBILITY, USB_PRODUCT_MOBILITY_EASIDOCK,
+	    "EasiDock Ethernet",
+	},
 	{
 	    USB_VENDOR_MOSCHIP, USB_PRODUCT_MOSCHIP_MCS7780,
 	    "Fast IrDA Adapter",
@@ -4485,6 +4585,14 @@ const struct usb_product usb_products[] = {
 	    USB_VENDOR_MOTOROLA2, USB_PRODUCT_MOTOROLA2_A920,
 	    "A920",
 	},
+	{
+	    USB_VENDOR_MOTOROLA2, USB_PRODUCT_MOTOROLA2_USBLAN,
+	    "USBLAN",
+	},
+	{
+	    USB_VENDOR_MOTOROLA2, USB_PRODUCT_MOTOROLA2_USBLAN2,
+	    "USBLAN",
+	},
 	{
 	    USB_VENDOR_MSYSTEMS, USB_PRODUCT_MSYSTEMS_DISKONKEY,
 	    "DiskOnKey",
@@ -4605,6 +4713,10 @@ const struct usb_product usb_products[] = {
 	    USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_CLIK40,
 	    "Clik! 40",
 	},
+	{
+	    USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_ETHERNETGADGET,
+	    "Linux Ethernet/RNDIS gadget on pxa210/25x/26x",
+	},
 	{
 	    USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_EA101,
 	    "Ethernet adapter",
@@ -4753,6 +4865,10 @@ const struct usb_product usb_products[] = {
 	    USB_VENDOR_OQO, USB_PRODUCT_OQO_WIFI01,
 	    "model 01 WiFi interface",
 	},
+	{
+	    USB_VENDOR_OQO, USB_PRODUCT_OQO_ETHER01PLUS,
+	    "model 01+ Ethernet",
+	},
 	{
 	    USB_VENDOR_OQO, USB_PRODUCT_OQO_ETHER01,
 	    "model 01 Ethernet interface",
@@ -5187,7 +5303,11 @@ const struct usb_product usb_products[] = {
 	},
 	{
 	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8150L,
-	    "Realtek RTL8150L USB-Ethernet Bridge",
+	    "RTL8150L USB-Ethernet Bridge",
+	},
+	{
+	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8151,
+	    "RTL8151 PNA",
 	},
 	{
 	    USB_VENDOR_RIM, USB_PRODUCT_RIM_BLACKBERRY,
@@ -5489,6 +5609,10 @@ const struct usb_product usb_products[] = {
 	    USB_VENDOR_SIEMENS2, USB_PRODUCT_SIEMENS2_MC75,
 	    "Wireless Modules MC75",
 	},
+	{
+	    USB_VENDOR_SIEMENS2, USB_PRODUCT_SIEMENS2_WL54G,
+	    "54g USB Network Adapter",
+	},
 	{
 	    USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD580,
 	    "Sierra Wireless AirCard 580",
@@ -5533,10 +5657,18 @@ const struct usb_product usb_products[] = {
 	    USB_VENDOR_SIIG2, USB_PRODUCT_SIIG2_US2308,
 	    "Serial",
 	},
+	{
+	    USB_VENDOR_SIIG2, USB_PRODUCT_SIIG2_USBTOETHER,
+	    "USB TO Ethernet",
+	},
 	{
 	    USB_VENDOR_SILICOM, USB_PRODUCT_SILICOM_U2E,
 	    "U2E",
 	},
+	{
+	    USB_VENDOR_SILICOM, USB_PRODUCT_SILICOM_GPE,
+	    "Psion Gold Port Ethernet",
+	},
 	{
 	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_POLOLU,
 	    "Pololu Serial",
@@ -5669,6 +5801,10 @@ const struct usb_product usb_products[] = {
 	    USB_VENDOR_SOHOWARE, USB_PRODUCT_SOHOWARE_NUB100,
 	    "10/100 USB Ethernet",
 	},
+	{
+	    USB_VENDOR_SOHOWARE, USB_PRODUCT_SOHOWARE_NUB110,
+	    "NUB110 Ethernet",
+	},
 	{
 	    USB_VENDOR_SOLIDYEAR, USB_PRODUCT_SOLIDYEAR_KEYBOARD,
 	    "Solid Year USB keyboard",
@@ -6273,5 +6409,9 @@ const struct usb_product usb_products[] = {
 	    USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_G220V2,
 	    "G-220 v2",
 	},
+	{
+	    USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_PRESTIGE,
+	    "Prestige",
+	},
 };
-const int usb_nproducts = 1122;
+const int usb_nproducts = 1152;