diff --git a/sys/dev/ed/if_ed_pccard.c b/sys/dev/ed/if_ed_pccard.c
index eb4ca78d5171..0522c79a4fef 100644
--- a/sys/dev/ed/if_ed_pccard.c
+++ b/sys/dev/ed/if_ed_pccard.c
@@ -137,7 +137,6 @@ static const struct ed_product {
 	{ PCMCIA_CARD(COREGA, FETHER_PCC_TXF, 0), NE2000DVF_DL10019 },
 	{ PCMCIA_CARD(DAYNA, COMMUNICARD_E_1, 0), 0},
 	{ PCMCIA_CARD(DAYNA, COMMUNICARD_E_2, 0), 0},
-	{ PCMCIA_CARD(DIGITAL2, DEPCMXX, 0), 0 },
 	{ PCMCIA_CARD(DLINK, DE650, 0), 0},
 	{ PCMCIA_CARD(DLINK, DE660, 0), 0 },
 	{ PCMCIA_CARD(DLINK, DE660PLUS, 0), 0},
@@ -147,8 +146,7 @@ static const struct ed_product {
 	{ PCMCIA_CARD(EPSON, EEN10B, 0), 0},
 	{ PCMCIA_CARD(EXP, THINLANCOMBO, 0), 0},
 	{ PCMCIA_CARD(IBM, INFOMOVER, 0), 0},
-	{ PCMCIA_CARD(IODATA, PCLAT, 0), 0},
-	{ PCMCIA_CARD(IODATA, PCLATE, 0), 0},
+	{ PCMCIA_CARD(IODATA3, PCLAT, 0), 0},
 	{ PCMCIA_CARD(KINGSTON, KNE2, 0), 0},
 	{ PCMCIA_CARD(LANTECH, FASTNETTX, 0),NE2000DVF_AX88190 },
 	{ PCMCIA_CARD(LINKSYS, COMBO_ECARD, 0), NE2000DVF_DL10019 },
@@ -165,8 +163,10 @@ static const struct ed_product {
 	{ PCMCIA_CARD(NDC, ND5100_E, 0), 0},
 	{ PCMCIA_CARD(NETGEAR, FA410TXC, 0), NE2000DVF_DL10019},
 	{ PCMCIA_CARD(NETGEAR, FA411, 0), NE2000DVF_AX88190},
+	{ PCMCIA_CARD(NEXTCOM, NEXTHAWK, 0), 0},
 	{ PCMCIA_CARD(PLANET, SMARTCOM2000, 0), 0 },
 	{ PCMCIA_CARD(PREMAX, PE200, 0), 0},
+	{ PCMCIA_CARD(RACORE, ETHERNET, 0), 0},
 	{ PCMCIA_CARD(RPTI, EP400, 0), 0},
 	{ PCMCIA_CARD(RPTI, EP401, 0), 0},
 	{ PCMCIA_CARD(SMC, EZCARD, 0), 0},
diff --git a/sys/dev/pccard/pccarddevs b/sys/dev/pccard/pccarddevs
index 7382dfb5e99c..66112d03b366 100644
--- a/sys/dev/pccard/pccarddevs
+++ b/sys/dev/pccard/pccarddevs
@@ -118,7 +118,7 @@ vendor KINGSTON			0x0186	Kingston
 vendor MELCO			0x018a	Melco Corporation
 vendor DAYNA			0x0194	Dayna Corporation
 vendor RAYTHEON			0x01a6	Raytheon
-vendor IODATA			0x01bf	I-O DATA
+vendor RACORE			0x01bf	Racore Computer Products
 vendor BAY			0x01eb	Bay Networks
 vendor FARALLON			0x0200	Farallon Communications
 vendor TELECOMDEVICE		0x021b	Telecom Device
@@ -333,7 +333,6 @@ product INTERSIL ISL37300P	0x7300 ISL37300P
 /* I-O DATA */
 product IODATA2 WNB11PCM	0x0002 I-O DATA WN-B11/PCM
 product IODATA2 WCF12		0x0673 Wireless CF Card
-product IODATA PCLATE		0x2216 I-O DATA PCLA/TE
 
 /* Kingston Products */
 product KINGSTON KNE2		0x0100 Kingston KNE-PC2 Ethernet
@@ -448,6 +447,9 @@ product QUATECH DSP_225		0x0008 Quatech Dual Serial Port
 /* Don't use because both cards have same product id */
 product RATOC REX_R280_9530	0x0001	RATOC REX-R280/REX-9530
 
+/* Racore Computer Products */
+product RACORE ETHERNET		0x2216 Racore PC Card Ethernet
+
 /* Raylink/WebGear */
 product RAYTHEON WLAN		0x0000 WLAN Adapter
 
@@ -539,7 +541,6 @@ vendor AMD			-1	AMD
 vendor BILLIONTON		-1	Billionton Systems Inc.
 vendor CNET			-1	CNet
 vendor COREGA			-1	Corega K.K.
-vendor DIGITAL2			-1 	Digital Equipment Corporation
 vendor DLINK			-1 	D-Link
 vendor DYNALINK			-1	DynaLink
 vendor EIGERLABS		-1	Eiger labs,Inc.
@@ -594,7 +595,6 @@ product COREGA WIRELESS_LAN_PCCA_11	{ "corega&spK.K.", "Wireless&spLAN&spPCCA-11
 product COREGA WIRELESS_LAN_PCCB_11	{ "corega_K.K.", "Wireless_LAN_PCCB-11", NULL, NULL } Corega Wireless LAN PCCB-11
 product COREGA WIRELESS_LAN_PCCL_11    { "corega", "WL&spPCCL-11", NULL, NULL } Corega Wireless LAN PCCL-11
 
-product DIGITAL2 DEPCMXX	{ "DIGITAL", "DEPCM-XX", NULL, NULL } DEC DEPCM-BA
 product DLINK DE650		{ "D-Link", "DE-650", NULL, NULL } D-Link DE-650
 product DLINK DE660		{ "D-Link", "DE-660", NULL, NULL } D-Link DE-660
 product DLINK DE660PLUS		{ "D-Link", "DE-660+", NULL, NULL } D-Link DE-660+
@@ -620,9 +620,9 @@ product GEMTEK WLAN		{ "Intersil", "PRISM&sp2_5&spPCMCIA&spADAPTER", "ISL37300P"
 product IBM SCSICARD		{ "IBM&spCorp.", "SCSI&spPCMCIA&spCard", NULL, NULL } IBM SCSI PCMCIA Card
 product ICOM SL200		{ "Icom", "SL-200", NULL, NULL } Icom SL-200
 product INTERSIL2 PRISM2	{ "INTERSIL", "HFA384x/IEEE", "Version&sp01.02", NULL } Intersil Prism II
-product IODATA CBIDE2		{ "IO&spDATA", "CBIDE2&sp&sp&sp&sp&sp&sp", NULL, NULL } IO-DATA CBIDE2/16-bit mode
+product IODATA3 CBIDE2		{ "IO&spDATA", "CBIDE2&sp&sp&sp&sp&sp&sp", NULL, NULL } IO-DATA CBIDE2/16-bit mode
 product IODATA3 CBSC16		{ "IO&spDATA", "CBSC16&sp&sp&sp&sp&sp&sp&sp", NULL, NULL } IO-DATA CBSC16
-product IODATA PCLAT		{ "I-O&spDATA", "PCLA", "ETHERNET", NULL } IO-DATA PCLA/T
+product IODATA3 PCLAT		{ "I-O&spDATA", "PCLA", "ETHERNET", NULL } IO-DATA PCLA/T
 product LANTECH FASTNETTX	{ "ASIX", "AX88190", NULL, NULL } Lantech Fastnet/TX
 product LINKSYS ECARD_2		{ "LINKSYS", "E-CARD", NULL, NULL } Linksys E-Card
 product LINKSYS PCM100		{ "Linksys", "EtherFast&sp10/100&spIntegrated&spPC&spCard&sp(PCM100)", "Ver&sp1.0", NULL }