diff --git a/host/windows/usb/android_winusb.inf b/host/windows/usb/android_winusb.inf
index de4f93e94..f88af7e97 100755
--- a/host/windows/usb/android_winusb.inf
+++ b/host/windows/usb/android_winusb.inf
@@ -3,12 +3,12 @@
 ;
 [Version]
 Signature           = "$Windows NT$"
-Class               = AndroidUsbDeviceClass
-ClassGuid           = {3F966BD9-FA04-4ec5-991C-D326973B5128}
+Class               = AndroidUsbDeviceClass
+ClassGuid           = {3F966BD9-FA04-4ec5-991C-D326973B5128}
 Provider            = %ProviderName%
-DriverVer           = 08/11/2009,2.0.0010.00002
-CatalogFile.NTx86   = androidwinusb86.cat
-CatalogFile.NTamd64 = androidwinusba64.cat
+DriverVer           = 08/11/2009,2.0.0010.00002
+CatalogFile.NTx86   = androidwinusb86.cat
+CatalogFile.NTamd64 = androidwinusba64.cat
 
 ;
 ; This section seems to be required for WinUsb driver installation.
@@ -32,6 +32,13 @@ HKR,,Icon,,-1
 %SingleBootLoaderInterface% = USB_Install, USB\VID_0BB4&PID_0FFF
 ; HTC Magic
 %CompositeAdbInterface%     = USB_Install, USB\VID_0BB4&PID_0C03&MI_01
+;
+;Moto Sholes
+%SingleBootLoaderInterface% = USB_Install, USB\VID_18D1&PID_D00D
+%SingleAdbInterface%        = USB_Install, USB\VID_18D1&PID_0002
+%CompositeAdbInterface%     = USB_Install, USB\VID_18D1&PID_0002&MI_01
+%SingleAdbInterface%        = USB_Install, USB\VID_22B8&PID_41DB
+%CompositeAdbInterface%     = USB_Install, USB\VID_22B8&PID_41DB&MI_01
 
 [Google.NTamd64]
 ; HTC Dream
@@ -40,6 +47,13 @@ HKR,,Icon,,-1
 %SingleBootLoaderInterface% = USB_Install, USB\VID_0BB4&PID_0FFF
 ; HTC Magic
 %CompositeAdbInterface%     = USB_Install, USB\VID_0BB4&PID_0C03&MI_01
+;
+;Moto Sholes
+%SingleBootLoaderInterface% = USB_Install, USB\VID_18D1&PID_D00D
+%SingleAdbInterface%        = USB_Install, USB\VID_18D1&PID_0002
+%CompositeAdbInterface%     = USB_Install, USB\VID_18D1&PID_0002&MI_01
+%SingleAdbInterface%        = USB_Install, USB\VID_22B8&PID_41DB
+%CompositeAdbInterface%     = USB_Install, USB\VID_22B8&PID_41DB&MI_01
 
 [USB_Install]
 Include = winusb.inf