diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index 3d0cee0b7998..8970d26e2b59 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/dev/usb/umass.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: umass.c,v 1.85 2001/12/31 15:54:27 augustss Exp $	*/
+/*	$NetBSD: umass.c,v 1.86 2002/02/07 13:52:54 augustss Exp $	*/
 /*-
  * Copyright (c) 1999 MAEKAWA Masahide <bishop@rr.iij4u.or.jp>,
  *		      Nick Hibma <n_hibma@freebsd.org>
@@ -94,7 +94,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.85 2001/12/31 15:54:27 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.86 2002/02/07 13:52:54 augustss Exp $");
 
 #include "atapibus.h"
 #include "scsibus.h"
@@ -440,7 +440,8 @@ USB_ATTACH(umass)
 	/*
 	 * Get the maximum LUN supported by the device.
 	 */
-	if (sc->sc_wire == UMASS_WPROTO_BBB) {
+	if (sc->sc_wire == UMASS_WPROTO_BBB && 
+	    !(sc->sc_quirks & UMASS_QUIRK_NO_MAX_LUN)) {
 		err = umass_bbb_get_max_lun(sc, &sc->maxlun);
 		if (err) {
 			printf("%s: unable to get Max Lun: %s\n",
diff --git a/sys/dev/usb/umassvar.h b/sys/dev/usb/umassvar.h
index 9126e587be73..29e6b4a80cb6 100644
--- a/sys/dev/usb/umassvar.h
+++ b/sys/dev/usb/umassvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: umassvar.h,v 1.14 2001/12/29 13:46:23 augustss Exp $	*/
+/*	$NetBSD: umassvar.h,v 1.15 2002/02/07 13:52:55 augustss Exp $	*/
 /*-
  * Copyright (c) 1999 MAEKAWA Masahide <bishop@rr.iij4u.or.jp>,
  *		      Nick Hibma <n_hibma@freebsd.org>
@@ -182,6 +182,7 @@ struct umass_softc {
 #define	UMASS_QUIRK_NO_START_STOP	0x00000004
 #define	UMASS_QUIRK_FORCE_SHORT_INQUIRY	0x00000008
 #define	UMASS_QUIRK_WRONG_CSWSIG	0x00000010
+#define UMASS_QUIRK_NO_MAX_LUN		0x00000020
 
 	u_int32_t		sc_busquirks;