diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 896db6116d4a..2f6a2f434b87 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -4,7 +4,7 @@
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.45 2001/01/03 11:45:03 n_hibma Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.47 2001/02/05 11:00:13 n_hibma Exp 
  */
 
 /*
@@ -58,6 +58,7 @@
 #define	USB_VENDOR_NEC	0x0409		/* NEC */
 #define	USB_VENDOR_KODAK	0x040a		/* Eastman Kodak Corp. */
 #define	USB_VENDOR_MELCO	0x0411		/* Melco, Inc. */
+#define	USB_VENDOR_CREATIVE	0x041e		/* Creative */
 #define	USB_VENDOR_ADI	0x0422		/* ADI Systems, Inc. */
 #define	USB_VENDOR_CATC	0x0423		/* Computer Access Technology Corp. */
 #define	USB_VENDOR_GRAVIS	0x0428		/* Advanced Gravis Computer Tech. Ltd. */
@@ -87,6 +88,7 @@
 #define	USB_VENDOR_ACERP	0x04a5		/* Acer Peripherals, Inc. */
 #define	USB_VENDOR_VISIONEER	0x04a7		/* Visioneer */
 #define	USB_VENDOR_CANON	0x04a9		/* Canon, Inc. */
+#define	USB_VENDOR_NIKON	0x04b0		/* Nikon */
 #define	USB_VENDOR_IBM	0x04b3		/* IBM Corporation */
 #define	USB_VENDOR_CYPRESS	0x04b4		/* Cypress Semiconductor */
 #define	USB_VENDOR_EPSON	0x04b8		/* Seiko Epson Corp. */
@@ -407,6 +409,9 @@
 #define	USB_PRODUCT_COREGA_ETHER_USB_T	0x0001		/* Ether USB-T */
 #define	USB_PRODUCT_COREGA_FETHER_USB_TX	0x0004		/* FEther USB-TX */
 
+/* Creative products */
+#define	USB_PRODUCT_CREATIVE_NOMAD_II	0x1002		/* Nomad II MP3 player */
+
 /* CTX products */
 #define	USB_PRODUCT_CTX_EX1300	0x9999		/* Ex1300 hub */
 
@@ -661,6 +666,9 @@
 /* Netgear products */
 #define	USB_PRODUCT_NETGEAR_EA101	0x1001		/* Ethernet adapter */
 
+/* Nikon products */
+#define	USB_PRODUCT_NIKON_E990	0x0102		/* Digital Camera E990 */
+
 /* OmniVision Technologies, Inc. products */
 #define	USB_PRODUCT_OMNIVISION_OV511	0x0511		/* OV511 Camera */
 #define	USB_PRODUCT_OMNIVISION_OV511PLUS	0xa511		/* OV511+ Camera */
@@ -772,6 +780,7 @@
 #define	USB_PRODUCT_DIAMOND2_SUPRAEXPRESS56K	0x07da		/* Supra Express 56K modem */
 #define	USB_PRODUCT_DIAMOND2_SUPRA2890	0x0b4a		/* SupraMax 2890 56K Modem */
 #define	USB_PRODUCT_DIAMOND2_RIO600USB	0x5001		/* Rio 600 USB */
+#define	USB_PRODUCT_DIAMOND2_RIO800USB	0x5002		/* Rio 800 USB */
 
 /* TEAC products */
 #define	USB_PRODUCT_TEAC_FD05PUB	0x0000		/* FD-05PUB floppy */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 5637dfcb43f6..05ef7d5e48d6 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -4,7 +4,7 @@
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.45 2001/01/03 11:45:03 n_hibma Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.47 2001/02/05 11:00:13 n_hibma Exp 
  */
 
 /*
@@ -387,6 +387,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Corega",
 	    "FEther USB-TX",
 	},
+	{
+	    USB_VENDOR_CREATIVE, USB_PRODUCT_CREATIVE_NOMAD_II,
+	    0,
+	    "Creative",
+	    "Nomad II MP3 player",
+	},
 	{
 	    USB_VENDOR_CTX, USB_PRODUCT_CTX_EX1300,
 	    0,
@@ -1233,6 +1239,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "BayNETGEAR, Inc.",
 	    "Ethernet adapter",
 	},
+	{
+	    USB_VENDOR_NIKON, USB_PRODUCT_NIKON_E990,
+	    0,
+	    "Nikon",
+	    "Digital Camera E990",
+	},
 	{
 	    USB_VENDOR_OMNIVISION, USB_PRODUCT_OMNIVISION_OV511,
 	    0,
@@ -1575,6 +1587,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Diamond (Supra)",
 	    "Rio 600 USB",
 	},
+	{
+	    USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_RIO800USB,
+	    0,
+	    "Diamond (Supra)",
+	    "Rio 800 USB",
+	},
 	{
 	    USB_VENDOR_TEAC, USB_PRODUCT_TEAC_FD05PUB,
 	    0,
@@ -1791,6 +1809,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Melco, Inc.",
 	    NULL,
 	},
+	{
+	    USB_VENDOR_CREATIVE, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Creative",
+	    NULL,
+	},
 	{
 	    USB_VENDOR_ADI, 0,
 	    USB_KNOWNDEV_NOPROD,
@@ -1965,6 +1989,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Canon, Inc.",
 	    NULL,
 	},
+	{
+	    USB_VENDOR_NIKON, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Nikon",
+	    NULL,
+	},
 	{
 	    USB_VENDOR_IBM, 0,
 	    USB_KNOWNDEV_NOPROD,