diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 307f0febf101..16b7e9a084ac 100644
--- a/sys/dev/pci/pcidevs.h
+++ b/sys/dev/pci/pcidevs.h
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcidevs.h,v 1.582 2003/10/15 20:31:52 itojun Exp $	*/
+/*	$NetBSD: pcidevs.h,v 1.583 2003/10/18 01:33:16 lukem Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcidevs,v 1.584 2003/10/15 20:31:38 itojun Exp 
+ *	NetBSD: pcidevs,v 1.585 2003/10/18 01:32:30 lukem Exp 
  */
 
 /*
@@ -41,10 +41,6 @@
 /*
  * NOTE: a fairly complete list of PCI codes can be found at:
  *
- *	http://members.hyperlink.net.au/~chart/pci.htm
- *
- * which replaces the database found at
- *
  *	http://www.yourvote.com/pci/
  *
  * (but it doesn't always seem to match vendor documentation)
@@ -2161,22 +2157,26 @@
 #define	PCI_PRODUCT_SEGA_BROADBAND	0x1234		/* Broadband Adapter */
 
 /* ServerWorks products */
-#define	PCI_PRODUCT_SERVERWORKS_OSB4	0x0200		/* OSB4 SouthBridge */
-#define	PCI_PRODUCT_SERVERWORKS_CSB5	0x0201		/* CSB5 SouthBridge */
 #define	PCI_PRODUCT_SERVERWORKS_XX5	0x0005		/* PCIHB5 */
 #define	PCI_PRODUCT_SERVERWORKS_CIOB20	0x0006		/* I/O Bridge */
 #define	PCI_PRODUCT_SERVERWORKS_XX7	0x0007		/* PCIHB7 */
 #define	PCI_PRODUCT_SERVERWORKS_CNB20HE	0x0008		/* CNB20HE Host */
 #define	PCI_PRODUCT_SERVERWORKS_CNB20LE	0x0009		/* CNB20LE Host */
 #define	PCI_PRODUCT_SERVERWORKS_CIOB30	0x0010		/* CIOB30 */
-#define	PCI_PRODUCT_SERVERWORKS_CIOBX2	0x0101		/* CIOB-X2 */
 #define	PCI_PRODUCT_SERVERWORKS_CMIC_HE	0x0011		/* CMIC_HE Host */
 #define	PCI_PRODUCT_SERVERWORKS_CMIC_LE	0x0012		/* CMIC_LE Host */
 #define	PCI_PRODUCT_SERVERWORKS_CMIC_SL	0x0017		/* CMIC_SL Host */
+#define	PCI_PRODUCT_SERVERWORKS_CIOBX2	0x0101		/* CIOB-X2 */
+#define	PCI_PRODUCT_SERVERWORKS_OSB4	0x0200		/* OSB4 SouthBridge */
+#define	PCI_PRODUCT_SERVERWORKS_CSB5	0x0201		/* CSB5 SouthBridge */
+#define	PCI_PRODUCT_SERVERWORKS_CSB6	0x0203		/* CSB6 SouthBridge */
 #define	PCI_PRODUCT_SERVERWORKS_OSB4_IDE	0x0211		/* OSB4 IDE */
 #define	PCI_PRODUCT_SERVERWORKS_CSB5_IDE	0x0212		/* CSB5 IDE */
-#define	PCI_PRODUCT_SERVERWORKS_CSB6_IDE	0x0213		/* CSB6 RAID/IDE */
-#define	PCI_PRODUCT_SERVERWORKS_USB	0x0220		/* OSB4/CSB5 USB */
+#define	PCI_PRODUCT_SERVERWORKS_CSB6_RAID	0x0213		/* CSB6 RAID/IDE */
+#define	PCI_PRODUCT_SERVERWORKS_CSB6_IDE	0x0217		/* CSB6 IDE */
+#define	PCI_PRODUCT_SERVERWORKS_OSB4_USB	0x0220		/* OSB4/CSB5 USB Host Controller */
+#define	PCI_PRODUCT_SERVERWORKS_CSB6_USB	0x0221		/* CSB6 USB Host Controller */
+#define	PCI_PRODUCT_SERVERWORKS_CSB6_IB	0x0227		/* CSB6 ISA bridge */
 
 /* SGI products */
 #define	PCI_PRODUCT_SGI_IOC3	0x0003		/* IOC3 */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 1b9c7540cbb1..a72557cd14b1 100644
--- a/sys/dev/pci/pcidevs_data.h
+++ b/sys/dev/pci/pcidevs_data.h
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcidevs_data.h,v 1.580 2003/10/15 20:31:52 itojun Exp $	*/
+/*	$NetBSD: pcidevs_data.h,v 1.581 2003/10/18 01:33:16 lukem Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcidevs,v 1.584 2003/10/15 20:31:38 itojun Exp 
+ *	NetBSD: pcidevs,v 1.585 2003/10/18 01:32:30 lukem Exp 
  */
 
 /*
@@ -7353,18 +7353,6 @@ const struct pci_knowndev pci_knowndevs[] = {
 	    "SEGA Enterprises",
 	    "Broadband Adapter",
 	},
-	{
-	    PCI_VENDOR_SERVERWORKS, PCI_PRODUCT_SERVERWORKS_OSB4,
-	    0,
-	    "ServerWorks",
-	    "OSB4 SouthBridge",
-	},
-	{
-	    PCI_VENDOR_SERVERWORKS, PCI_PRODUCT_SERVERWORKS_CSB5,
-	    0,
-	    "ServerWorks",
-	    "CSB5 SouthBridge",
-	},
 	{
 	    PCI_VENDOR_SERVERWORKS, PCI_PRODUCT_SERVERWORKS_XX5,
 	    0,
@@ -7401,12 +7389,6 @@ const struct pci_knowndev pci_knowndevs[] = {
 	    "ServerWorks",
 	    "CIOB30",
 	},
-	{
-	    PCI_VENDOR_SERVERWORKS, PCI_PRODUCT_SERVERWORKS_CIOBX2,
-	    0,
-	    "ServerWorks",
-	    "CIOB-X2",
-	},
 	{
 	    PCI_VENDOR_SERVERWORKS, PCI_PRODUCT_SERVERWORKS_CMIC_HE,
 	    0,
@@ -7425,6 +7407,30 @@ const struct pci_knowndev pci_knowndevs[] = {
 	    "ServerWorks",
 	    "CMIC_SL Host",
 	},
+	{
+	    PCI_VENDOR_SERVERWORKS, PCI_PRODUCT_SERVERWORKS_CIOBX2,
+	    0,
+	    "ServerWorks",
+	    "CIOB-X2",
+	},
+	{
+	    PCI_VENDOR_SERVERWORKS, PCI_PRODUCT_SERVERWORKS_OSB4,
+	    0,
+	    "ServerWorks",
+	    "OSB4 SouthBridge",
+	},
+	{
+	    PCI_VENDOR_SERVERWORKS, PCI_PRODUCT_SERVERWORKS_CSB5,
+	    0,
+	    "ServerWorks",
+	    "CSB5 SouthBridge",
+	},
+	{
+	    PCI_VENDOR_SERVERWORKS, PCI_PRODUCT_SERVERWORKS_CSB6,
+	    0,
+	    "ServerWorks",
+	    "CSB6 SouthBridge",
+	},
 	{
 	    PCI_VENDOR_SERVERWORKS, PCI_PRODUCT_SERVERWORKS_OSB4_IDE,
 	    0,
@@ -7438,16 +7444,34 @@ const struct pci_knowndev pci_knowndevs[] = {
 	    "CSB5 IDE",
 	},
 	{
-	    PCI_VENDOR_SERVERWORKS, PCI_PRODUCT_SERVERWORKS_CSB6_IDE,
+	    PCI_VENDOR_SERVERWORKS, PCI_PRODUCT_SERVERWORKS_CSB6_RAID,
 	    0,
 	    "ServerWorks",
 	    "CSB6 RAID/IDE",
 	},
 	{
-	    PCI_VENDOR_SERVERWORKS, PCI_PRODUCT_SERVERWORKS_USB,
+	    PCI_VENDOR_SERVERWORKS, PCI_PRODUCT_SERVERWORKS_CSB6_IDE,
 	    0,
 	    "ServerWorks",
-	    "OSB4/CSB5 USB",
+	    "CSB6 IDE",
+	},
+	{
+	    PCI_VENDOR_SERVERWORKS, PCI_PRODUCT_SERVERWORKS_OSB4_USB,
+	    0,
+	    "ServerWorks",
+	    "OSB4/CSB5 USB Host Controller",
+	},
+	{
+	    PCI_VENDOR_SERVERWORKS, PCI_PRODUCT_SERVERWORKS_CSB6_USB,
+	    0,
+	    "ServerWorks",
+	    "CSB6 USB Host Controller",
+	},
+	{
+	    PCI_VENDOR_SERVERWORKS, PCI_PRODUCT_SERVERWORKS_CSB6_IB,
+	    0,
+	    "ServerWorks",
+	    "CSB6 ISA bridge",
 	},
 	{
 	    PCI_VENDOR_SGI, PCI_PRODUCT_SGI_IOC3,