diff --git a/config/dyn-modes/adb_mode.ini b/config/dyn-modes/adb_mode.ini
index 63b6103..325262a 100644
--- a/config/dyn-modes/adb_mode.ini
+++ b/config/dyn-modes/adb_mode.ini
@@ -12,4 +12,4 @@ sysfs_reset_value = none
 softconnect_path = /sys/class/android_usb/android0/enable
 softconnect = 1
 softconnec_disconnect = 0
-idProduct = 0003
+idProduct = 0A03
diff --git a/config/dyn-modes/developer_mode-android.ini b/config/dyn-modes/developer_mode-android.ini
index e9cc819..9114f82 100644
--- a/config/dyn-modes/developer_mode-android.ini
+++ b/config/dyn-modes/developer_mode-android.ini
@@ -11,4 +11,4 @@ sysfs_reset_value = none
 softconnect_path = /sys/class/android_usb/android0/enable
 softconnect = 1
 softconnec_disconnect = 0
-idProduct = 0002
+idProduct = 0A02
diff --git a/config/dyn-modes/diag_mode.ini b/config/dyn-modes/diag_mode.ini
index bad6817..0e1c5e2 100644
--- a/config/dyn-modes/diag_mode.ini
+++ b/config/dyn-modes/diag_mode.ini
@@ -16,4 +16,4 @@ android_extra_sysfs_path = /sys/class/android_usb/android0/f_diag/clients
 android_extra_sysfs_value = diag
 android_extra_sysfs_path2 = /sys/class/android_usb/android0/f_serial/transports
 android_extra_sysfs_value2 = smd,tty
-idProduct = 0004
+idProduct = 0A04
diff --git a/config/dyn-modes/pc_suite-android.ini b/config/dyn-modes/pc_suite-android.ini
index ceae478..f249cd9 100644
--- a/config/dyn-modes/pc_suite-android.ini
+++ b/config/dyn-modes/pc_suite-android.ini
@@ -9,4 +9,4 @@ sysfs_reset_value = none
 softconnect_path = /sys/class/android_usb/android0/enable
 softconnect = 1
 softconnec_disconnect = 0
-idProduct = 0001
+idProduct = 0A01
diff --git a/src/usb_moded-android.c b/src/usb_moded-android.c
index a93257b..05e07aa 100644
--- a/src/usb_moded-android.c
+++ b/src/usb_moded-android.c
@@ -91,7 +91,7 @@ int set_android_charging_mode(void)
 
    /* disable, set functions to "mass_storage", re-enable */
    write_to_file("/sys/class/android_usb/android0/enable", "0");
-   write_to_file("/sys/class/android_usb/android0/idProduct", "9999");
+   write_to_file("/sys/class/android_usb/android0/idProduct", "0AFE"); /* TODO: make configurable */
    write_to_file("/sys/class/android_usb/android0/functions", "mass_storage");
    ret = write_to_file("/sys/class/android_usb/android0/enable", "1");
    if(ret < 0)