diff --git a/sys/dev/pccard/pccarddevs b/sys/dev/pccard/pccarddevs
index c143d7ad831..7afbe4ff5c6 100644
--- a/sys/dev/pccard/pccarddevs
+++ b/sys/dev/pccard/pccarddevs
@@ -103,7 +103,7 @@ vendor ACTIONTEC		0x1668	ACTIONTEC
 vendor LASAT			0x3401	Lasat Communications A/S
 vendor BONDWELL			0x3b01	Bondwell
 vendor LEXARMEDIA		0x4e01	Lexar Media
-vendor OEM1			0x50c2	Mystery OEM #1
+vendor AIRVAST                  0x50c2  AirVast Technology
 vendor ARCHOS			0x5241	Archos
 vendor DUAL			0x890f	Dual
 vendor EDIMAX			0x890f	Edimax Technology Inc.
@@ -151,6 +151,9 @@ product AIRONET PC4500		0x0005 Aironet PC4500 Wireless LAN Adapter
 product AIRONET PC4800		0x0007 Aironet PC4800 Wireless LAN Adapter
 product AIRONET 350		0x000a Aironet 350 Wireless LAN Adapter
 
+/* AirVast */
+product AIRVAST WN_100          0x7300 AirVast WN-100 
+
 /* Allied Telesis K.K. */
 product ALLIEDTELESIS LA_PCM	0x0002 Allied Telesis LA-PCM
 
@@ -325,9 +328,6 @@ product NOKIA C020_WLAN		0x20c0 Nokia C020 WLAN Card
 product NWN WLAN_550		0x0002 NWN 550 WLAN
 product NWN WLAN_1148		0x0003 NWN 1148 WLAN
 
-/* Mystery OEM #1 */
-product OEM1 PRISM3		0x7300 Prism 3 37300P
-
 /* Olicom Products */
 product OLICOM TR		0x2132 GoCard Token Ring 16/4
 
diff --git a/sys/dev/wi/if_wi_pccard.c b/sys/dev/wi/if_wi_pccard.c
index e4674447ce4..ce4ba2aca5f 100644
--- a/sys/dev/wi/if_wi_pccard.c
+++ b/sys/dev/wi/if_wi_pccard.c
@@ -127,6 +127,7 @@ static const struct pccard_product wi_pccard_products[] = {
 	PCMCIA_CARD(3COM, 3CRWE777A, 0),
 	PCMCIA_CARD(ACTIONTEC, PRISM, 0),
 	PCMCIA_CARD(ADDTRON, AWP100, 0),
+	PCMCIA_CARD(AIRVAST, WN_100, 0),
 	PCMCIA_CARD(ALLIEDTELESIS, WR211PCM, 0),
 	PCMCIA_CARD(ARTEM, ONAIR, 0),
  	PCMCIA_CARD(ASUS, WL100, 0),
@@ -155,8 +156,8 @@ static const struct pccard_product wi_pccard_products[] = {
 	PCMCIA_CARD(LINKSYS2, WCF11, 0),
 	PCMCIA_CARD(LUCENT, WAVELAN_IEEE, 0),
 	PCMCIA_CARD(NETGEAR_2, MA401RA, 0),
+	PCMCIA_CARD(NOKIA, C020_WLAN, 0),
 	PCMCIA_CARD(NOKIA, C110_WLAN, 0),
-	PCMCIA_CARD(OEM1, PRISM3, 0),
 	PCMCIA_CARD(PLANEX_2, GWNS11H, 0),
 	PCMCIA_CARD(PROXIM, RANGELANDS_8430, 0),
 	PCMCIA_CARD(SAMSUNG, SWL_2000N, 0),