diff --git a/BoardConfig.mk b/BoardConfig.mk
index c8e2de0..a9a6964 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -50,9 +50,6 @@ BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth
 # Camera
 TARGET_USES_QTI_CAMERA_DEVICE := true
 
-# Charger Mode
-BOARD_CHARGER_ENABLE_SUSPEND := true
-
 # Filesystem
 TARGET_FS_CONFIG_GEN := $(DEVICE_PATH)/config.fs
 
diff --git a/product_prop.mk b/product_prop.mk
index d3e2d96..9e2f8a7 100644
--- a/product_prop.mk
+++ b/product_prop.mk
@@ -1,3 +1,7 @@
+# Charger
+PRODUCT_PRODUCT_PROPERTIES += \
+   ro.charger.enable_suspend=true
+
 # Display
 PRODUCT_PROPERTY_OVERRIDES += \
    ro.sf.lcd_density=480