diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 767c8b278e9e..7151f15a44ce 100644
--- a/sys/dev/pci/pcidevs.h
+++ b/sys/dev/pci/pcidevs.h
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcidevs.h,v 1.336 2001/06/18 13:19:07 onoe Exp $	*/
+/*	$NetBSD: pcidevs.h,v 1.337 2001/06/20 05:46:24 imp Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcidevs,v 1.330 2001/06/18 13:18:08 onoe Exp 
+ *	NetBSD: pcidevs,v 1.331 2001/06/20 05:44:33 imp Exp 
  */
 
 /*
@@ -1080,7 +1080,11 @@
 #define	PCI_PRODUCT_ESSTECH2_MAESTRO1	0x0100		/* Maestro 1 PCI Audio Accelerator */
 
 /* O2 Micro Inc */
-#define	PCI_PRODUCT_O2MICRO_OZ6832	0x6832		/* OZ6832 CardBus Controller */
+#define	PCI_PRODUCT_O2MICRO_OZ6729	0x6729		/* OZ6729 PCI-PCMCIA Bridge */
+#define	PCI_PRODUCT_O2MICRO_OZ6730	0x673A		/* OZ6730 PCI-PCMCIA Bridge */
+#define	PCI_PRODUCT_O2MICRO_OZ6832	0x6832		/* OZ6832/OZ6833 PCI-CardBus Bridge */
+#define	PCI_PRODUCT_O2MICRO_OZ6860	0x6836		/* OZ6860 PCI-Cardbus Bridge */
+#define	PCI_PRODUCT_O2MICRO_OZ6872	0x6872		/* OZ6812/OZ6872 PCI-Cardbus Bridge */
 
 /* Evans & Sutherland products */
 #define	PCI_PRODUCT_ES_FREEDOM	0x0001		/* Freedom PCI-GBus Interface */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 84161b1c924a..2cdffa54d475 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.334 2001/06/18 13:19:07 onoe Exp $	*/
+/*	$NetBSD: pcidevs_data.h,v 1.335 2001/06/20 05:46:24 imp Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcidevs,v 1.330 2001/06/18 13:18:08 onoe Exp 
+ *	NetBSD: pcidevs,v 1.331 2001/06/20 05:44:33 imp Exp 
  */
 
 /*
@@ -2253,11 +2253,35 @@ const struct pci_knowndev pci_knowndevs[] = {
 	    "ESS Technology Inc",
 	    "Maestro 1 PCI Audio Accelerator",
 	},
+	{
+	    PCI_VENDOR_O2MICRO, PCI_PRODUCT_O2MICRO_OZ6729,
+	    0,
+	    "O2 Micro Inc",
+	    "OZ6729 PCI-PCMCIA Bridge",
+	},
+	{
+	    PCI_VENDOR_O2MICRO, PCI_PRODUCT_O2MICRO_OZ6730,
+	    0,
+	    "O2 Micro Inc",
+	    "OZ6730 PCI-PCMCIA Bridge",
+	},
 	{
 	    PCI_VENDOR_O2MICRO, PCI_PRODUCT_O2MICRO_OZ6832,
 	    0,
 	    "O2 Micro Inc",
-	    "OZ6832 CardBus Controller",
+	    "OZ6832/OZ6833 PCI-CardBus Bridge",
+	},
+	{
+	    PCI_VENDOR_O2MICRO, PCI_PRODUCT_O2MICRO_OZ6860,
+	    0,
+	    "O2 Micro Inc",
+	    "OZ6860 PCI-Cardbus Bridge",
+	},
+	{
+	    PCI_VENDOR_O2MICRO, PCI_PRODUCT_O2MICRO_OZ6872,
+	    0,
+	    "O2 Micro Inc",
+	    "OZ6812/OZ6872 PCI-Cardbus Bridge",
 	},
 	{
 	    PCI_VENDOR_ES, PCI_PRODUCT_ES_FREEDOM,