diff --git a/src/calibre/devices/android/driver.py b/src/calibre/devices/android/driver.py
index a7b9fdea0f..8b7f5f3d24 100644
--- a/src/calibre/devices/android/driver.py
+++ b/src/calibre/devices/android/driver.py
@@ -33,7 +33,9 @@ class ANDROID(USBMS):
 
             # Samsung
             0x04e8 : { 0x681d : [0x0222, 0x0400],
-                       0x681c : [0x0222, 0x0224, 0x0400]},
+                       0x681c : [0x0222, 0x0224, 0x0400],
+                       0x6640 : [0x0100],
+                     },
 
             # Acer
             0x502 : { 0x3203 : [0x0100]},
@@ -54,9 +56,9 @@ class ANDROID(USBMS):
             'GT-I5700', 'SAMSUNG', 'DELL', 'LINUX']
     WINDOWS_MAIN_MEM = ['ANDROID_PHONE', 'A855', 'A853', 'INC.NEXUS_ONE',
             '__UMS_COMPOSITE', '_MB200', 'MASS_STORAGE', '_-_CARD',
-            'GT-I9000', 'FILE-STOR_GADGET', 'SGH-T959']
+            'GT-I9000', 'FILE-STOR_GADGET', 'SGH-T959', 'SAMSUNG_ANDROID']
     WINDOWS_CARD_A_MEM = ['ANDROID_PHONE', 'GT-I9000_CARD',
-            'FILE-STOR_GADGET', 'SGH-T959']
+            'FILE-STOR_GADGET', 'SGH-T959', 'SAMSUNG_ANDROID']
 
     OSX_MAIN_MEM = 'HTC Android Phone Media'