diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index 1f6f5776013..4952eb4d3b8 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/dev/usb/umass.c
@@ -453,6 +453,10 @@ Static struct umass_devdescr_t umass_devdescrs[] = {
 	  UMASS_PROTO_UFI | UMASS_PROTO_CBI,
 	  NO_QUIRKS
 	},
+	{ USB_VENDOR_TWINMOS, USB_PRODUCT_TWINMOS_MDIV, RID_WILDCARD,
+	  UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
+	  NO_QUIRKS
+	},
 	{ USB_VENDOR_WESTERN,  USB_PRODUCT_WESTERN_EXTHDD, RID_WILDCARD,
 	  UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
 	  FORCE_SHORT_INQUIRY | NO_START_STOP | IGNORE_RESIDUE
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 3ebf57a42d2..9c801cbb68f 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -439,6 +439,7 @@ vendor ASANTE		0x10bd	Asante
 vendor JRC		0x1145	Japan Radio Company
 vendor DELORME		0x1163	DeLorme Publishing
 vendor ACERCM		0x1189	Acer Communications & Multimedia Inc.
+vendor TWINMOS		0x126f	TwinMOS
 vendor BELKIN2		0x1293	Belkin Components
 vendor AINCOMM		0x12fd	Ain Communication Technology
 vendor MOBILITY		0x1342	Mobility
@@ -1400,6 +1401,9 @@ product TREK THUMBDRIVE_8MB	0x9988	ThumbDrive_8MB
 /* Trumpion products */
 product TRUMPION C3310		0x1100	Comotron C3310 MP3 player
 
+/* TwinMOS */
+product TWINMOS MDIV		0x1325	Memory Disk IV
+
 /* Ultima products */
 product ULTIMA 1200UBPLUS	0x4002	1200 UB Plus scanner