diff --git a/src/calibre/devices/android/driver.py b/src/calibre/devices/android/driver.py
index 91130fff9e..8881552d2b 100644
--- a/src/calibre/devices/android/driver.py
+++ b/src/calibre/devices/android/driver.py
@@ -19,8 +19,12 @@ class ANDROID(USBMS):
 
     VENDOR_ID   = {
             0x0bb4 : { 0x0c02 : [0x100], 0x0c01 : [0x100]},
-            0x22b8 : { 0x41d9 : [0x216]},
+
+            # Motorola
+            0x22b8 : { 0x41d9 : [0x216], 0x2d67 : [0x100]},
+
             0x18d1 : { 0x4e11 : [0x0100, 0x226], 0x4e12: [0x0100, 0x226]},
+
             0x04e8 : { 0x681d : [0x0222]},
             }
     EBOOK_DIR_MAIN = ['wordplayer/calibretransfer', 'eBooks/import', 'Books']
@@ -31,7 +35,7 @@ class ANDROID(USBMS):
 
     VENDOR_NAME      = ['HTC', 'MOTOROLA', 'GOOGLE_', 'ANDROID']
     WINDOWS_MAIN_MEM = ['ANDROID_PHONE', 'A855', 'A853', 'INC.NEXUS_ONE',
-            '___UMS_COMPOSITE',]
+            '___UMS_COMPOSITE', '_MB200']
 
     OSX_MAIN_MEM = 'HTC Android Phone Media'