diff --git a/release/texts/HARDWARE.TXT b/release/texts/HARDWARE.TXT
index e75f4bfd153..5ed69531372 100644
--- a/release/texts/HARDWARE.TXT
+++ b/release/texts/HARDWARE.TXT
@@ -736,6 +736,8 @@ MacAlly mouse (3 buttons).
 MacAlly self powered hub (4 ports).
 MacAlly iKey keyboard.
 
+Matshita CF-VFDU03 floppy drive.
+
 Microsoft IntelliMouse (3 buttons).
 Microsoft keyboard.
 
@@ -743,6 +745,8 @@ Microtech USB-SCSI-HD 50 USB to SCSI cable.
 
 NEC hub.
 
+Panasonic floppy drive.
+
 Trust Ami Mouse (3 buttons).
 
 Y-E Data floppy drive (720/1.44/2.88Mb).
diff --git a/share/man/man4/umass.4 b/share/man/man4/umass.4
index bfb744f03d6..23b98db8720 100644
--- a/share/man/man4/umass.4
+++ b/share/man/man4/umass.4
@@ -48,9 +48,9 @@ Supported are
 .Bl -tag -compact -width xxxxxx
 .It Iomega USB Zip 100 drive
 .It Iomega USB Zip 250 drive
-.It Y-E Data Flashbuster-U
-.It VAIO floppy drive
 .It Microtech International, Inc. USB-SCSI-HD 50 USB to SCSI cable.
+.It Panasonic ("Matshita FDD CF-VFDU03")
+.It VAIO floppy drive (includes Y-E Data Flashbuster-U)
 .El
 .Pp
 .Nm usb
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index c0354a775dd..760b275ea77 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -198,7 +198,13 @@ static struct da_quirk_entry da_quirk_table[] =
 		 */
 		{T_DIRECT, SIP_MEDIA_REMOVABLE, "Y-E DATA", "USB-FDU", "*"},
 		/*quirks*/ DA_Q_NO_6_BYTE|DA_Q_NO_SYNC_CACHE
+	},
+	{
+		/* Another USB floppy */
+		{T_DIRECT, SIP_MEDIA_REMOVABLE, "MATSHITA", "FDD CF-VFDU*","*"},
+		/*quirks*/ DA_Q_NO_6_BYTE|DA_Q_NO_SYNC_CACHE
 	}
+
 };
 
 static	d_open_t	daopen;