diff -r eaaed528d5fd -r 320d509f1a12 usbmgmt/usbmgr/group/Usbman.iby
--- a/usbmgmt/usbmgr/group/Usbman.iby	Fri Sep 17 08:40:15 2010 +0300
+++ b/usbmgmt/usbmgr/group/Usbman.iby	Mon Oct 04 03:06:48 2010 +0300
@@ -117,13 +117,12 @@
 file=ABI_DIR\USB_DIR\usbclasscontroller.dll		usbclasscontroller.dll
 file=ABI_DIR\USB_DIR\usbmanextensionplugin.dll		usbmanextensionplugin.dll
 
-#ifdef WITH_REFERENCE_USB_CHARGING_PLUGIN
-// *** Reference battery charging plug-in
-#if defined(SYMBIAN_ENABLE_USB_OTG_HOST) && defined (SYMBIAN_INCLUDE_USB_OTG_HOST)
-USB_PLUGIN(usbbatterychargingpluginotg.dll,usbbatterychargingpluginotg.rsc)
-#else
-USB_PLUGIN(usbbatterychargingplugin.dll,usbbatterychargingplugin.rsc)
-#endif
+#if defined(SYMBIAN_USB_BATTERYCHARGING_V1_1) || defined (WITH_REFERENCE_USB_CHARGING_PLUGIN)
+	#if defined(SYMBIAN_ENABLE_USB_OTG_HOST) && defined (SYMBIAN_INCLUDE_USB_OTG_HOST)
+		USB_PLUGIN(usbbatterychargingpluginotg.dll,usbbatterychargingpluginotg.rsc)
+	#else
+		USB_PLUGIN(usbbatterychargingplugin.dll,usbbatterychargingplugin.rsc)
+	#endif
 #endif
 
 // *** WHCM Class Controller - used for OBEX over USB.