diff --git a/debian/changelog b/debian/changelog
index 01df7e002..50141cb2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,13 @@ linux (4.16-1~exp1) UNRELEASED; urgency=medium
 
   * New upstream release: https://kernelnewbies.org/Linux_4.16
 
+  [ Jeremy Stanley ]
+  * [x86] Power management support for GPD Pocket UMPC systems
+    - Enable CONFIG_CHARGER_BQ24190 as a module (provides support for the
+      battery charger) along with its dependencies CONFIG_EXTCON=m,
+      CONFIG_EXTCON_INTEL_CHT_WC=m, CONFIG_I2C_CHT_WC=m and
+      CONFIG_INTEL_SOC_PMIC_CHTWC=y
+
   [ Roger Shimizu ]
   * [armel] Bring back armel build by reverting two commits that disabled
     armel previously:
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index d923cce21..357aee2d3 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -446,6 +446,12 @@ CONFIG_EDAC_SKX=m
 CONFIG_EDAC_AMD8131=m
 CONFIG_EDAC_AMD8111=m
 
+##
+## file: drivers/extcon/Kconfig
+##
+CONFIG_EXTCON=m
+CONFIG_EXTCON_INTEL_CHT_WC=m
+
 ##
 ## file: drivers/firmware/Kconfig
 ##
@@ -652,6 +658,7 @@ CONFIG_I2C_AMD8111=m
 CONFIG_I2C_I801=m
 CONFIG_I2C_ISMT=m
 CONFIG_I2C_PIIX4=m
+CONFIG_I2C_CHT_WC=m
 CONFIG_I2C_NFORCE2=m
 CONFIG_I2C_SIS5595=m
 CONFIG_I2C_SIS630=m
@@ -901,6 +908,7 @@ CONFIG_VIDEO_TM6000_DVB=m
 ##
 # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
 CONFIG_LPC_ICH=m
+CONFIG_INTEL_SOC_PMIC_CHTWC=y
 CONFIG_MFD_INTEL_LPSS_ACPI=m
 CONFIG_MFD_INTEL_LPSS_PCI=m
 CONFIG_MFD_KEMPLD=m
@@ -1401,6 +1409,7 @@ CONFIG_PNP=y
 ## file: drivers/power/supply/Kconfig
 ##
 CONFIG_BATTERY_SBS=m
+CONFIG_CHARGER_BQ24190=m
 
 ##
 ## file: drivers/powercap/Kconfig