Index: sys/cam/scsi/scsi_da.c
===================================================================
--- sys/cam/scsi/scsi_da.c	(revision 181963)
+++ sys/cam/scsi/scsi_da.c	(working copy)
@@ -409,6 +409,13 @@
 	},
 	{
 		/*
+		 * Samsung USB Mass Storage (i.e., SPH-M500 phone)
+		 */
+		{T_DIRECT, SIP_MEDIA_REMOVABLE, "Samsung" , "Mass Storage*",
+		"*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE
+	},
+	{
+		/*
 		 * SanDisk Micro Cruzer 128MB
 		 * PR: usb/75970
 		 */
Index: sys/dev/usb/usbdevs
===================================================================
--- sys/dev/usb/usbdevs	(revision 181963)
+++ sys/dev/usb/usbdevs	(working copy)
@@ -1944,6 +1944,7 @@
 product QUALCOMM CDMA_MSM	0x6000	CDMA Technologies MSM phone
 product QUALCOMM2 RWT_FCT	0x3100	RWT FCT-CDMA 2000 1xRTT modem
 product QUALCOMM2 CDMA_MSM	0x3196	CDMA Technologies MSM modem
+product QUALCOMM2 USB_MMC	0x1000	USB MMC Storage
 product QUALCOMMINC CDMA_MSM	0x0001	CDMA Technologies MSM modem
 
 /* Qtronix products */
@@ -1989,7 +1990,7 @@
 /* Samsung products */
 product SAMSUNG ML6060		0x3008	ML-6060 laser printer
 product SAMSUNG YP_U2		0x5050	YP-U2 MP3 Player
-product SAMSUNG I500		0x6601	I500 Palm USB Phone 
+product SAMSUNG I500		0x6601	I500 Palm/SPH-M500 USB Phones
 
 /* Samsung Techwin products */
 product SAMSUNG_TECHWIN DIGIMAX_410	0x000a	Digimax 410
Index: sys/dev/usb/umass.c
===================================================================
--- sys/dev/usb/umass.c	(revision 181963)
+++ sys/dev/usb/umass.c	(working copy)
@@ -646,6 +646,10 @@
 	  UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
 	  IGNORE_RESIDUE | NO_START_STOP
 	},
+	{ USB_VENDOR_QUALCOMM2, USB_PRODUCT_QUALCOMM2_USB_MMC, RID_WILDCARD,
+	  UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
+	  NO_GETMAXLUN
+	},
 	{ USB_VENDOR_SAMSUNG,  USB_PRODUCT_SAMSUNG_YP_U2, RID_WILDCARD,
 	  UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
 	  SHUTTLE_INIT | NO_GETMAXLUN