diff --git a/sys/dev/pcmcia/pcmciadevs.h b/sys/dev/pcmcia/pcmciadevs.h
index 19fb777cf29f..306b16e8bfc4 100644
--- a/sys/dev/pcmcia/pcmciadevs.h
+++ b/sys/dev/pcmcia/pcmciadevs.h
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcmciadevs.h,v 1.91 2000/06/09 13:05:03 onoe Exp $	*/
+/*	$NetBSD: pcmciadevs.h,v 1.92 2000/06/13 02:18:19 soren Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcmciadevs,v 1.91 2000/06/06 17:19:59 soren Exp 
+ *	NetBSD: pcmciadevs,v 1.93 2000/06/13 02:18:00 soren Exp 
  */
 
 /*-
@@ -176,25 +176,25 @@
 /* IBM Products */
 #define	PCMCIA_CIS_IBM_3270	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_IBM_3270	0x0001
-#define	PCMCIA_STR_IBM_3270	"3270 Emulation"
+#define	PCMCIA_STR_IBM_3270	"IBM 3270 Emulation"
 #define	PCMCIA_CIS_IBM_INFOMOVER	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_IBM_INFOMOVER	0x0002
-#define	PCMCIA_STR_IBM_INFOMOVER	"National Semiconductor InfoMover"
+#define	PCMCIA_STR_IBM_INFOMOVER	"IBM InfoMover"
 #define	PCMCIA_CIS_IBM_5250	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_IBM_5250	0x000b
-#define	PCMCIA_STR_IBM_5250	"5250 Emulation"
+#define	PCMCIA_STR_IBM_5250	"IBM 5250 Emulation"
 #define	PCMCIA_CIS_IBM_TROPIC	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_IBM_TROPIC	0x001e
-#define	PCMCIA_STR_IBM_TROPIC	"Token Ring 4/16"
+#define	PCMCIA_STR_IBM_TROPIC	"IBM Token Ring 4/16"
+#define	PCMCIA_CIS_IBM_PORTABLE_CDROM	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_IBM_PORTABLE_CDROM	0x002d
+#define	PCMCIA_STR_IBM_PORTABLE_CDROM	"IBM PCMCIA Portable CD-ROM Drive"
 #define	PCMCIA_CIS_IBM_HOME_AND_AWAY	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_IBM_HOME_AND_AWAY	0x002e
 #define	PCMCIA_STR_IBM_HOME_AND_AWAY	"IBM Home and Away Modem"
 #define	PCMCIA_CIS_IBM_WIRELESS_LAN_ENTRY	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_IBM_WIRELESS_LAN_ENTRY	0x0032
-#define	PCMCIA_STR_IBM_WIRELESS_LAN_ENTRY	"Wireless LAN Entry"
-#define	PCMCIA_CIS_IBM_PORTABLE_CDROM	{ NULL, NULL, NULL, NULL }
-#define	PCMCIA_PRODUCT_IBM_PORTABLE_CDROM	0x002d
-#define	PCMCIA_STR_IBM_PORTABLE_CDROM	"PCMCIA Portable CD-ROM Drive"
+#define	PCMCIA_STR_IBM_WIRELESS_LAN_ENTRY	"IBM Wireless LAN Entry"
 #define	PCMCIA_CIS_IBM_ETHERJET	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_IBM_ETHERJET	0x003f
 #define	PCMCIA_STR_IBM_ETHERJET	"IBM EtherJet Ethernet"
diff --git a/sys/dev/pcmcia/pcmciadevs_data.h b/sys/dev/pcmcia/pcmciadevs_data.h
index 22241dd88678..3485d7379da2 100644
--- a/sys/dev/pcmcia/pcmciadevs_data.h
+++ b/sys/dev/pcmcia/pcmciadevs_data.h
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcmciadevs_data.h,v 1.91 2000/06/09 13:05:03 onoe Exp $	*/
+/*	$NetBSD: pcmciadevs_data.h,v 1.92 2000/06/13 02:18:19 soren Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcmciadevs,v 1.91 2000/06/06 17:19:59 soren Exp 
+ *	NetBSD: pcmciadevs,v 1.93 2000/06/13 02:18:00 soren Exp 
  */
 
 /*-
@@ -196,28 +196,35 @@ struct pcmcia_knowndev pcmcia_knowndevs[] = {
 	    PCMCIA_CIS_IBM_3270,
 	    0,
 	    "IBM Corporation",
-	    "3270 Emulation"	},
+	    "IBM 3270 Emulation"	},
 	},
 	{
 	    PCMCIA_VENDOR_IBM, PCMCIA_PRODUCT_IBM_INFOMOVER,
 	    PCMCIA_CIS_IBM_INFOMOVER,
 	    0,
 	    "IBM Corporation",
-	    "National Semiconductor InfoMover"	},
+	    "IBM InfoMover"	},
 	},
 	{
 	    PCMCIA_VENDOR_IBM, PCMCIA_PRODUCT_IBM_5250,
 	    PCMCIA_CIS_IBM_5250,
 	    0,
 	    "IBM Corporation",
-	    "5250 Emulation"	},
+	    "IBM 5250 Emulation"	},
 	},
 	{
 	    PCMCIA_VENDOR_IBM, PCMCIA_PRODUCT_IBM_TROPIC,
 	    PCMCIA_CIS_IBM_TROPIC,
 	    0,
 	    "IBM Corporation",
-	    "Token Ring 4/16"	},
+	    "IBM Token Ring 4/16"	},
+	},
+	{
+	    PCMCIA_VENDOR_IBM, PCMCIA_PRODUCT_IBM_PORTABLE_CDROM,
+	    PCMCIA_CIS_IBM_PORTABLE_CDROM,
+	    0,
+	    "IBM Corporation",
+	    "IBM PCMCIA Portable CD-ROM Drive"	},
 	},
 	{
 	    PCMCIA_VENDOR_IBM, PCMCIA_PRODUCT_IBM_HOME_AND_AWAY,
@@ -231,14 +238,7 @@ struct pcmcia_knowndev pcmcia_knowndevs[] = {
 	    PCMCIA_CIS_IBM_WIRELESS_LAN_ENTRY,
 	    0,
 	    "IBM Corporation",
-	    "Wireless LAN Entry"	},
-	},
-	{
-	    PCMCIA_VENDOR_IBM, PCMCIA_PRODUCT_IBM_PORTABLE_CDROM,
-	    PCMCIA_CIS_IBM_PORTABLE_CDROM,
-	    0,
-	    "IBM Corporation",
-	    "PCMCIA Portable CD-ROM Drive"	},
+	    "IBM Wireless LAN Entry"	},
 	},
 	{
 	    PCMCIA_VENDOR_IBM, PCMCIA_PRODUCT_IBM_ETHERJET,