diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 855a3ebdcd9f..4ee6d9c159be 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.126 2003/06/13 11:20:26 joe Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.127 2003/06/25 22:50:57 joe Exp 
  */
 
 /*
@@ -274,6 +274,7 @@
 #define	USB_VENDOR_COREGA	0x07aa		/* Corega */
 #define	USB_VENDOR_FREECOM	0x07ab		/* Freecom */
 #define	USB_VENDOR_MICROTECH	0x07af		/* Microtech */
+#define	USB_VENDOR_GENERALINSTMNTS	0x07b2		/* General Instruments (Motorola) */
 #define	USB_VENDOR_OLYMPUS	0x07b4		/* Olympus */
 #define	USB_VENDOR_ABOCOM	0x07b8		/* AboCom Systems */
 #define	USB_VENDOR_KEISOKUGIKEN	0x07c1		/* Keisokugiken */
@@ -501,9 +502,11 @@
 #define	USB_PRODUCT_BTC_BTC7932	0x6782		/* Keyboard with mouse port */
 
 /* Canon, Inc. products */
-#define	USB_PRODUCT_CANON_N656U	0x2206		/* CANOSCAN N656U */
+#define	USB_PRODUCT_CANON_N656U	0x2206		/* CanoScan N656U */
+#define	USB_PRODUCT_CANON_N1240U	0x220e		/* CanoScan N1240U */
 #define	USB_PRODUCT_CANON_S10	0x3041		/* PowerShot S10 */
 #define	USB_PRODUCT_CANON_S100	0x3045		/* PowerShot S100 */
+#define	USB_PRODUCT_CANON_S200	0x3065		/* PowerShot S200 */
 
 /* CATC products */
 #define	USB_PRODUCT_CATC_NETMATE	0x000a		/* Netmate ethernet adapter */
@@ -614,8 +617,8 @@
 #define	USB_PRODUCT_EPSON_1600	0x0107		/* Expression 1600 scanner */
 #define	USB_PRODUCT_EPSON_1640	0x010a		/* Perfection 1640SU scanner */
 #define	USB_PRODUCT_EPSON_1240	0x010b		/* Perfection 1240U / 1240Photo scanner */
-#define	USB_PRODUCT_EPSON_1250	0x010f		/* Perfection 1250U / 1250Photo scanner */
 #define	USB_PRODUCT_EPSON_640U	0x010c		/* Perfection 640U scanner */
+#define	USB_PRODUCT_EPSON_1250	0x010f		/* Perfection 1250U / 1250Photo scanner */
 #define	USB_PRODUCT_EPSON_1650	0x0110		/* Perfection 1650 scanner */
 #define	USB_PRODUCT_EPSON_GT9700F	0x0112		/* GT-9700F scanner */
 #define	USB_PRODUCT_EPSON_1260	0x011d		/* Perfection 1260 scanner */
@@ -652,6 +655,9 @@
 /* Fujitsu protducts */
 #define	USB_PRODUCT_FUJITSU_AH_F401U	0x105b		/* AH-F401U Air H device */
 
+/* General Instruments (Motorola) products */
+#define	USB_PRODUCT_GENERALINSTMNTS_SB5100	0x5100		/* SURFboard SB5100 Cable modem */
+
 /* Genesys Logic products */
 #define	USB_PRODUCT_GENESYS_GL650	0x0604		/* GL650 Hub */
 #define	USB_PRODUCT_GENESYS_GL641USB	0x0700		/* GL641USB CompactFlash Card Reader */
@@ -822,6 +828,7 @@
 #define	USB_PRODUCT_LOGITECH_WMJOY	0xc281		/* WingMan Force joystick */
 #define	USB_PRODUCT_LOGITECH_RK53	0xc501		/* Cordless mouse */
 #define	USB_PRODUCT_LOGITECH_RB6	0xc503		/* Cordless keyboard */
+#define	USB_PRODUCT_LOGITECH_MX700	0xc506		/* Cordless optical mouse */
 #define	USB_PRODUCT_LOGITECH_QUICKCAMPRO2	0xd001		/* QuickCam Pro */
 
 /* Lucent products */
@@ -855,8 +862,9 @@
 #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 */
+#define	USB_PRODUCT_MICROSOFT_INETPRO	0x001c		/* Internet Keyboard Pro */
 #define	USB_PRODUCT_MICROSOFT_INTELLIEYE	0x0025		/* IntelliEye mouse */
-#define	USB_PRODUCT_MICROSOFT_INETPRO	0x002b		/* Internet Keyboard Pro */
+#define	USB_PRODUCT_MICROSOFT_INETPRO2	0x002b		/* Internet Keyboard Pro */
 
 /* Microtech products */
 #define	USB_PRODUCT_MICROTECH_SCSIDB25	0x0004		/* USB-SCSI-DB25 */
@@ -1046,6 +1054,7 @@
 #define	USB_PRODUCT_SHUTTLE_EUSCSI_B	0x000b		/* eUSCSI Bridge */
 #define	USB_PRODUCT_SHUTTLE_EUSCSI_C	0x000c		/* eUSCSI Bridge */
 #define	USB_PRODUCT_SHUTTLE_CDRW	0x0101		/* CD-RW Device */
+#define	USB_PRODUCT_SHUTTLE_EUSBORCA	0x0325		/* eUSB ORCA Quad Reader */
 
 /* Siemens products */
 #define	USB_PRODUCT_SIEMENS_SPEEDSTREAM	0x1001		/* SpeedStream USB */
@@ -1163,6 +1172,7 @@
 #define	USB_PRODUCT_WACOM_CT0405U	0x0000		/* CT-0405-U Tablet */
 #define	USB_PRODUCT_WACOM_GRAPHIRE	0x0010		/* Graphire */
 #define	USB_PRODUCT_WACOM_INTUOSA5	0x0021		/* Intuos A5 */
+#define	USB_PRODUCT_WACOM_GD0912U	0x0022		/* Intuos 9x12 Graphics Tablet */
  
 /* Xirlink products */
 #define	USB_PRODUCT_XIRLINK_PCCAM	0x8080		/* IBM PC Camera */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index b01a910ec255..203961454c8a 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.126 2003/06/13 11:20:26 joe Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.127 2003/06/25 22:50:57 joe Exp 
  */
 
 /*
@@ -511,7 +511,13 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    USB_VENDOR_CANON, USB_PRODUCT_CANON_N656U,
 	    0,
 	    "Canon",
-	    "CANOSCAN N656U",
+	    "CanoScan N656U",
+	},
+	{
+	    USB_VENDOR_CANON, USB_PRODUCT_CANON_N1240U,
+	    0,
+	    "Canon",
+	    "CanoScan N1240U",
 	},
 	{
 	    USB_VENDOR_CANON, USB_PRODUCT_CANON_S10,
@@ -525,6 +531,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Canon",
 	    "PowerShot S100",
 	},
+	{
+	    USB_VENDOR_CANON, USB_PRODUCT_CANON_S200,
+	    0,
+	    "Canon",
+	    "PowerShot S200",
+	},
 	{
 	    USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE,
 	    0,
@@ -915,18 +927,18 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Seiko Epson",
 	    "Perfection 1240U / 1240Photo scanner",
 	},
-	{
-	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1250,
-	    0,
-	    "Seiko Epson",
-	    "Perfection 1250U / 1250Photo scanner",
-	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_640U,
 	    0,
 	    "Seiko Epson",
 	    "Perfection 640U scanner",
 	},
+	{
+	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1250,
+	    0,
+	    "Seiko Epson",
+	    "Perfection 1250U / 1250Photo scanner",
+	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1650,
 	    0,
@@ -1017,6 +1029,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Fujitsu",
 	    "AH-F401U Air H device",
 	},
+	{
+	    USB_VENDOR_GENERALINSTMNTS, USB_PRODUCT_GENERALINSTMNTS_SB5100,
+	    0,
+	    "General Instruments (Motorola)",
+	    "SURFboard SB5100 Cable modem",
+	},
 	{
 	    USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL650,
 	    0,
@@ -1695,6 +1713,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Logitech",
 	    "Cordless keyboard",
 	},
+	{
+	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_MX700,
+	    0,
+	    "Logitech",
+	    "Cordless optical mouse",
+	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRO2,
 	    0,
@@ -1809,6 +1833,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Microsoft",
 	    "Sidewinder Precision Racing Wheel",
 	},
+	{
+	    USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_INETPRO,
+	    0,
+	    "Microsoft",
+	    "Internet Keyboard Pro",
+	},
 	{
 	    USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_INTELLIEYE,
 	    0,
@@ -1816,7 +1846,7 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "IntelliEye mouse",
 	},
 	{
-	    USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_INETPRO,
+	    USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_INETPRO2,
 	    0,
 	    "Microsoft",
 	    "Internet Keyboard Pro",
@@ -2499,6 +2529,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Shuttle Technology",
 	    "CD-RW Device",
 	},
+	{
+	    USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSBORCA,
+	    0,
+	    "Shuttle Technology",
+	    "eUSB ORCA Quad Reader",
+	},
 	{
 	    USB_VENDOR_SIEMENS, USB_PRODUCT_SIEMENS_SPEEDSTREAM,
 	    0,
@@ -2871,6 +2907,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "WACOM",
 	    "Intuos A5",
 	},
+	{
+	    USB_VENDOR_WACOM, USB_PRODUCT_WACOM_GD0912U,
+	    0,
+	    "WACOM",
+	    "Intuos 9x12 Graphics Tablet",
+	},
 	{
 	    USB_VENDOR_XIRLINK, USB_PRODUCT_XIRLINK_PCCAM,
 	    0,
@@ -4107,6 +4149,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Microtech",
 	    NULL,
 	},
+	{
+	    USB_VENDOR_GENERALINSTMNTS, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "General Instruments (Motorola)",
+	    NULL,
+	},
 	{
 	    USB_VENDOR_OLYMPUS, 0,
 	    USB_KNOWNDEV_NOPROD,