diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index e7f78d878a25..a95ca0bb3dc6 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs.h,v 1.72 2000/01/17 12:57:54 augustss Exp $	*/
+/*	$NetBSD: usbdevs.h,v 1.73 2000/01/17 14:56:23 augustss Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.71 2000/01/17 12:57:27 augustss Exp 
+ *	NetBSD: usbdevs,v 1.72 2000/01/17 14:56:01 augustss Exp 
  */
 
 /*
@@ -114,13 +114,16 @@
 #define	USB_VENDOR_LINKSYS	0x066b		/* Linksys Inc. */
 #define	USB_VENDOR_MULTITECH	0x06e0		/* MultiTech */
 #define	USB_VENDOR_ADS	0x06e1		/* ADS Technologies */
+#define	USB_VENDOR_SIRIUS	0x06ea		/* Sirius Technologies */
 #define	USB_VENDOR_SMC	0x0707		/* Standard Microsystems Corp */
 #define	USB_VENDOR_MIDIMAN	0x0763		/* Midiman */
 #define	USB_VENDOR_SANDISK	0x0781		/* SanDisk Corp */
 #define	USB_VENDOR_ADMTEK	0x07a6		/* ADMtek Inc. */
 #define	USB_VENDOR_COREGA	0x07aa		/* Corega */
 #define	USB_VENDOR_SIIG	0x07cc		/* SIIG */
+#define	USB_VENDOR_ZOOM	0x0803		/* Zoom Telephonics Inc. */
 #define	USB_VENDOR_HANDSPRING	0x082d		/* Handspring Inc. */
+#define	USB_VENDOR_DIAMOND	0x0841		/* Diamond */
 #define	USB_VENDOR_NETGEAR	0x0846		/* BayNETGEAR Inc. */
 #define	USB_VENDOR_ACTIVEWIRE	0x0854		/* ActiveWire Inc. */
 #define	USB_VENDOR_BILLIONTON	0x08dd		/* Billionton Systems Inc. */
@@ -227,6 +230,9 @@
 /* Dallas Semiconductor products */
 #define	USB_PRODUCT_DALLAS_J6502	0x4201		/* J-6502 speakers */
 
+/* Diamond products */
+#define	USB_PRODUCT_DIAMOND_RIO500USB	0x0001		/* Rio 500 USB */
+
 /* EIZO products */
 #define	USB_PRODUCT_EIZO_HUB	0x0000		/* hub */
 #define	USB_PRODUCT_EIZO_MONITOR	0x0001		/* monitor */
@@ -261,7 +267,11 @@
 
 /* HP products */
 #define	USB_PRODUCT_HP_4100C	0x0101		/* Scanjet 4100C */
+#define	USB_PRODUCT_HP_S20	0x0102		/* Photosmart S20 */
+#define	USB_PRODUCT_HP_5200	0x0401		/* Scanjet 5200 */
 #define	USB_PRODUCT_HP_6300C	0x0601		/* Scanjet 6300C */
+#define	USB_PRODUCT_HP_970CSE	0x1004		/* Deskjet 970Cse */
+#define	USB_PRODUCT_HP_P1100	0x3102		/* Photosmart P1100 */
 
 /* Inside Out Networks products */
 #define	USB_PRODUCT_INSIDEOUT_EDGEPORT4	0x0001		/* EdgePort/4 serial ports */
@@ -281,6 +291,8 @@
 
 /* Kodak products */
 #define	USB_PRODUCT_KODAK_DC260	0x0110		/* Digital Science DC260 */
+#define	USB_PRODUCT_KODAK_DC265	0x0111		/* Digital Science DC265 */
+#define	USB_PRODUCT_KODAK_DC290	0x0111		/* Digital Science DC290 */
 #define	USB_PRODUCT_KODAK_DC240	0x0120		/* Digital Science DC240 */
 #define	USB_PRODUCT_KODAK_DC280	0x0130		/* Digital Science DC280 */
 
@@ -318,6 +330,7 @@
 #define	USB_PRODUCT_MICROSOFT_INTELLIMOUSE	0x0009		/* IntelliMouse */
 #define	USB_PRODUCT_MICROSOFT_NATURALKBD	0x000b		/* Natural Keyboard Elite */
 #define	USB_PRODUCT_MICROSOFT_DDS80	0x0014		/* Digital Sound System 80 */
+#define	USB_PRODUCT_MICROSOFT_SIDEWINDER	0x001a		/* Sidewinder Precision Racing Wheel */
 
 /* Midiman products */
 #define	USB_PRODUCT_MIDIMAN_MIDISPORT2X2	0x1001		/* Midisport 2x2 */
@@ -380,6 +393,9 @@
 /* SIIG products */
 #define	USB_PRODUCT_SIIG_DIGIFILMREADER	0x0004		/* DigiFilm-Combo Reader */
 
+/* Sirius Technologies products */
+#define	USB_PRODUCT_SIRIUS_ROADSTER	0x0001		/* NetComm Roadster II 56 USB */
+
 /* SMC products */
 #define	USB_PRODUCT_SMC_2102USB	0x0100		/* 10Mbps ethernet adapter */
 #define	USB_PRODUCT_SMC_2202USB	0x0200		/* 10/100 ethernet adapter */
@@ -412,3 +428,5 @@
 /* Wacom products */
 #define	USB_PRODUCT_WACOM_CT0405U	0x0000		/* CT-0405-U Tablet */
 
+/* Zoom Telephonics Inc. products */
+#define	USB_PRODUCT_ZOOM_2986L	0x9700		/* 2986L Fax modem */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 23e1cb24228c..c75d176ed7a6 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.72 2000/01/17 12:57:55 augustss Exp $	*/
+/*	$NetBSD: usbdevs_data.h,v 1.73 2000/01/17 14:56:23 augustss Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.71 2000/01/17 12:57:27 augustss Exp 
+ *	NetBSD: usbdevs,v 1.72 2000/01/17 14:56:01 augustss Exp 
  */
 
 /*
@@ -267,6 +267,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Dallas Semiconductor",
 	    "J-6502 speakers",
 	},
+	{
+	    USB_VENDOR_DIAMOND, USB_PRODUCT_DIAMOND_RIO500USB,
+	    0,
+	    "Diamond",
+	    "Rio 500 USB",
+	},
 	{
 	    USB_VENDOR_EIZO, USB_PRODUCT_EIZO_HUB,
 	    0,
@@ -369,12 +375,36 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Hewlett Packard",
 	    "Scanjet 4100C",
 	},
+	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_S20,
+	    0,
+	    "Hewlett Packard",
+	    "Photosmart S20",
+	},
+	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_5200,
+	    0,
+	    "Hewlett Packard",
+	    "Scanjet 5200",
+	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_6300C,
 	    0,
 	    "Hewlett Packard",
 	    "Scanjet 6300C",
 	},
+	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_970CSE,
+	    0,
+	    "Hewlett Packard",
+	    "Deskjet 970Cse",
+	},
+	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_P1100,
+	    0,
+	    "Hewlett Packard",
+	    "Photosmart P1100",
+	},
 	{
 	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT4,
 	    0,
@@ -417,6 +447,18 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Eastman Kodak Corp.",
 	    "Digital Science DC260",
 	},
+	{
+	    USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC265,
+	    0,
+	    "Eastman Kodak Corp.",
+	    "Digital Science DC265",
+	},
+	{
+	    USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC290,
+	    0,
+	    "Eastman Kodak Corp.",
+	    "Digital Science DC290",
+	},
 	{
 	    USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC240,
 	    0,
@@ -531,6 +573,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Microsoft",
 	    "Digital Sound System 80",
 	},
+	{
+	    USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_SIDEWINDER,
+	    0,
+	    "Microsoft",
+	    "Sidewinder Precision Racing Wheel",
+	},
 	{
 	    USB_VENDOR_MIDIMAN, USB_PRODUCT_MIDIMAN_MIDISPORT2X2,
 	    0,
@@ -681,6 +729,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "SIIG",
 	    "DigiFilm-Combo Reader",
 	},
+	{
+	    USB_VENDOR_SIRIUS, USB_PRODUCT_SIRIUS_ROADSTER,
+	    0,
+	    "Sirius Technologies",
+	    "NetComm Roadster II 56 USB",
+	},
 	{
 	    USB_VENDOR_SMC, USB_PRODUCT_SMC_2102USB,
 	    0,
@@ -747,6 +801,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "WACOM Corp. Ltd.",
 	    "CT-0405-U Tablet",
 	},
+	{
+	    USB_VENDOR_ZOOM, USB_PRODUCT_ZOOM_2986L,
+	    0,
+	    "Zoom Telephonics Inc.",
+	    "2986L Fax modem",
+	},
 	{
 	    USB_VENDOR_AOX, 0,
 	    USB_KNOWNDEV_NOPROD,
@@ -1143,6 +1203,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "ADS Technologies",
 	    NULL,
 	},
+	{
+	    USB_VENDOR_SIRIUS, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Sirius Technologies",
+	    NULL,
+	},
 	{
 	    USB_VENDOR_SMC, 0,
 	    USB_KNOWNDEV_NOPROD,
@@ -1179,12 +1245,24 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "SIIG",
 	    NULL,
 	},
+	{
+	    USB_VENDOR_ZOOM, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Zoom Telephonics Inc.",
+	    NULL,
+	},
 	{
 	    USB_VENDOR_HANDSPRING, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Handspring Inc.",
 	    NULL,
 	},
+	{
+	    USB_VENDOR_DIAMOND, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Diamond",
+	    NULL,
+	},
 	{
 	    USB_VENDOR_NETGEAR, 0,
 	    USB_KNOWNDEV_NOPROD,