diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index ec0256de8439..252dec288239 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.515 2008/10/10 23:50:39 jakllsch Exp $
+$NetBSD: usbdevs,v 1.516 2008/10/19 11:36:11 joerg Exp $
 
 /*
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -447,6 +447,7 @@ vendor SHARK		0x13d2	Shark
 vendor PHISON		0x13fe	Phison Electronics Corp.
 vendor NOVATEL2		0x1410	Novatel
 vendor OMNIVISION2	0x1415	OmniVision Technologies, Inc.
+vendor MERLIN		0x1416	Merlin
 vendor WISTRONNEWEB	0x1435	Wistron NeWeb
 vendor HUAWEI3COM	0x1472	Huawei-3Com
 vendor SILICOM		0x1485	Silicom
@@ -473,6 +474,7 @@ vendor METAGEEK		0x1781	MetaGeek
 vendor AMIT		0x18c5	AMIT
 vendor QCOM		0x18e8	Qcom
 vendor LINKSYS3		0x1915	Linksys
+vendor QUALCOMMINC	0x19d2	Qualcomm, Incorporated
 vendor DLINK		0x2001	D-Link
 vendor PLANEX2		0x2019	Planex Communications
 vendor ERICSSON		0x2282	Ericsson
@@ -1494,6 +1496,9 @@ product MELCO SG54HP		0x00d8	WLI-U2-SG54HP
 product MELCO G54HP		0x00d9	WLI-U2-G54HP
 product MELCO KG54L		0x00da	WLI-U2-KG54L
 
+/* Merlin products */
+product MERLIN V620             0x1110  Merlin V620
+
 /* MetaGeek products */
 product METAGEEK WISPY_24X	0x083f	Wi-Spy 2.4x
 
@@ -1674,9 +1679,13 @@ product NOVATECH RT2573		0x9021	RT2573
 product NOVATEL FLEXPACKGPS	0x0100	NovAtel FlexPack GPS receiver
 product NOVATEL2 EXPRESSCARD	0x1100	ExpressCard 3G
 product NOVATEL2 MERLINV620	0x1110	Novatel Wireless Merlin CDMA
+product NOVATEL2 V740		0x1120	Merlin V740
 product NOVATEL2 S720		0x1130	S720
 product NOVATEL2 MERLINU740	0x1400	Novatel Merlin U740
+product NOVATEL2 U740_2		0x1410	Merlin U740
+product NOVATEL2 U870		0x1420	Merlin U870
 product NOVATEL2 XU870		0x1430	XU870
+product NOVATEL2 X950D		0x1450	Merlin X950D
 product NOVATEL2 ES620		0x2100	ES620 CDMA
 product NOVATEL2 U720		0x2110	U720
 product NOVATEL2 U727		0x4100	U727
@@ -1707,12 +1716,12 @@ product ONSPEC MD1II		0xb006	Datafab MD1-II PC-Card Reader
 product ONSPEC2 8IN2		0xb012	8In2
 
 /* Option N.V. products */
-product OPTIONNV VODAFONEMC3G	0x5000	Vodafone Mobile Connect 3G datacard
-product OPTIONNV MC3G		0x5000	Mobile Connect 3G datacard
+product OPTIONNV MC3G		0x5000	Vodafone Mobile Connect 3G datacard
 product OPTIONNV QUADUMTS2	0x6000	GlobeTrotter Fusion Quad Lite UMTS/GPRS
 product OPTIONNV QUADUMTS	0x6300	GlobeTrotter Fusion Quad Lite 3D
 product OPTIONNV QUADPLUSUMTS	0x6600	GlobeTrotter 3G Quad Plus
 product OPTIONNV HSDPA   	0x6701	GlobeTrotter HSDPA Modem
+product OPTIONNV GTMAXHSUPA	0x7001	GlobeTrotter HSUPA
 
 /* OQO */
 product OQO WIFI01		0x0002	model 01 WiFi interface
@@ -1867,6 +1876,7 @@ product QTRONIX 980N		0x2011	Scorpion-980N keyboard
 product QUALCOMM CDMA_MSM	0x6000	CDMA Technologies MSM phone
 product QUALCOMM MSM_HSDPA	0x6613	HSDPA MSM
 product QUALCOMM2 CDMA_MSM	0x3196	CDMA Technologies MSM modem
+product QUALCOMMINC CDMA_MSM	0x0001	CDMA Technologies MSM modem
 
 /* Qualcomm Kyocera products */
 product QUALCOMM_K CDMA_MSM_K	0x17da	Qualcomm Kyocera CDMA Technologies MSM
@@ -2022,16 +2032,29 @@ product SIEMENS2 WL54G		0x3c06	54g USB Network Adapter
 /* Sierra Wireless products */
 product SIERRA AIRCARD580	0x0112	Sierra Wireless AirCard 580
 product SIERRA AIRCARD595	0x0019	Sierra Wireless AirCard 595
-product SIERRA MINI5725		0x0220	Sierra Wireless miniPCI 5275
+product SIERRA AC595U		0x0120	Sierra Wireless AirCard 595U
+product SIERRA AC597E		0x0021	Sierra Wireless AirCard 597E
+product SIERRA C597		0x0023	Sierra Wireless Compass 597
+product SIERRA AC880		0x6850	Sierra Wireless AirCard 880
+product SIERRA AC881		0x6851	Sierra Wireless AirCard 881
+product SIERRA AC880E		0x6852	Sierra Wireless AirCard 880E
+product SIERRA AC881E		0x6853	Sierra Wireless AirCard 881E
+product SIERRA AC880U		0x6855	Sierra Wireless AirCard 880U
+product SIERRA AC881U		0x6856	Sierra Wireless AirCard 881U
 product SIERRA EM5625		0x0017	EM5625
-product SIERRA MC5720		0x0018	MC5720
+product SIERRA MC5720		0x0218	MC5720 Wireless Modem
+product SIERRA MC5720_2		0x0018	MC5720
 product SIERRA MC5725		0x0020	MC5725
+product SIERRA MINI5725		0x0220	Sierra Wireless miniPCI 5275
 product SIERRA MC8755_2		0x6802	MC8755
 product SIERRA MC8765		0x6803	MC8765
-product SIERRA MC8755		0x6804	MC8755 HSDPA
-product SIERRA MC8775		0x6812	MC8775 HSDPA
+product SIERRA MC8755		0x6804	MC8755
+product SIERRA AC875U		0x6812	AC875U HSDPA USB Modem
 product SIERRA MC8755_3		0x6813	MC8755 HSDPA
+product SIERRA MC8775_2		0x6815	MC8775
 product SIERRA AIRCARD875	0x6820	Aircard 875 HSDPA
+product SIERRA MC8780		0x6832	MC8780
+product SIERRA MC8781		0x6833	MC8781
 
 /* Sigmatel products */
 product SIGMATEL SIR4116	0x4116	StIR4116 SIR