diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index 63882bc4e4e2..010d31ef4c8b 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$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 $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -34,10 +34,6 @@ $NetBSD: pcidevs,v 1.584 2003/10/15 20:31:38 itojun Exp $
 /*
  * 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)
@@ -2154,22 +2150,26 @@ product SANDBURST	FE1000	0x0200	FE1000
 product SEGA	BROADBAND	0x1234	Broadband Adapter
 
 /* ServerWorks products */
-product SERVERWORKS OSB4	0x0200	OSB4 SouthBridge
-product SERVERWORKS CSB5	0x0201	CSB5 SouthBridge
 product SERVERWORKS XX5		0x0005	PCIHB5
 product SERVERWORKS CIOB20	0x0006	I/O Bridge
 product SERVERWORKS XX7		0x0007	PCIHB7
 product SERVERWORKS CNB20HE	0x0008	CNB20HE Host
 product SERVERWORKS CNB20LE	0x0009	CNB20LE Host
 product SERVERWORKS CIOB30	0x0010	CIOB30
-product SERVERWORKS CIOBX2	0x0101	CIOB-X2
 product SERVERWORKS CMIC_HE	0x0011	CMIC_HE Host
 product SERVERWORKS CMIC_LE	0x0012	CMIC_LE Host
 product SERVERWORKS CMIC_SL	0x0017	CMIC_SL Host
+product SERVERWORKS CIOBX2	0x0101	CIOB-X2
+product SERVERWORKS OSB4	0x0200	OSB4 SouthBridge
+product SERVERWORKS CSB5	0x0201	CSB5 SouthBridge
+product SERVERWORKS CSB6	0x0203	CSB6 SouthBridge
 product SERVERWORKS OSB4_IDE	0x0211	OSB4 IDE
 product SERVERWORKS CSB5_IDE	0x0212	CSB5 IDE
-product SERVERWORKS CSB6_IDE	0x0213	CSB6 RAID/IDE
-product SERVERWORKS USB		0x0220	OSB4/CSB5 USB
+product SERVERWORKS CSB6_RAID	0x0213	CSB6 RAID/IDE
+product SERVERWORKS CSB6_IDE	0x0217	CSB6 IDE
+product SERVERWORKS OSB4_USB	0x0220	OSB4/CSB5 USB Host Controller
+product SERVERWORKS CSB6_USB	0x0221	CSB6 USB Host Controller
+product SERVERWORKS CSB6_IB	0x0227	CSB6 ISA bridge
 
 /* SGI products */
 product SGI IOC3	0x0003	IOC3