diff --git a/debian/changelog b/debian/changelog
index 01df7e002..947d74345 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,27 @@ 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
+    (Closes: #895164)
+    - Enable CONFIG_PWM_LPSS_PLATFORM as a module (provides support for the
+      low-level power subsystem handling backlight control) along with its
+      dependency CONFIG_PWM=y
+    - Enable CONFIG_INTEL_INT0002_VGPIO as a module (provides support for the
+      Bay Trail/Cherry Trail virtual GPIO controller to handle power events)
+    - Enable CONFIG_REGULATOR (needed to build the already enabled
+      CONFIG_INTEL_CHT_INT33FE module which provides support for the ACPI
+      interface)
+    - Enable CONFIG_TYPEC_FUSB302 as a module (provides support for the USB
+      type-C interface) along with its dependencies CONFIG_TYPEC=m and
+      CONFIG_TYPEC_TCPM=m
+    - Enable CONFIG_BATTERY_MAX17042 as a module (provides support for the
+      battery level monitor)
+    - 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..2668073d5 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
@@ -1378,6 +1386,7 @@ CONFIG_TOSHIBA_BT_RFKILL=m
 CONFIG_TOSHIBA_HAPS=m
 CONFIG_ACPI_CMPC=m
 CONFIG_INTEL_CHT_INT33FE=m
+CONFIG_INTEL_INT0002_VGPIO=m
 CONFIG_INTEL_HID_EVENT=m
 CONFIG_INTEL_VBTN=m
 CONFIG_INTEL_IPS=m
@@ -1401,6 +1410,8 @@ CONFIG_PNP=y
 ## file: drivers/power/supply/Kconfig
 ##
 CONFIG_BATTERY_SBS=m
+CONFIG_BATTERY_MAX17042=m
+CONFIG_CHARGER_BQ24190=m
 
 ##
 ## file: drivers/powercap/Kconfig
@@ -1413,6 +1424,17 @@ CONFIG_INTEL_RAPL=m
 ##
 CONFIG_PTP_1588_CLOCK_PCH=m
 
+##
+## file: drivers/pwm/Kconfig
+##
+CONFIG_PWM=y
+CONFIG_PWM_LPSS_PLATFORM=m
+
+##
+## file: drivers/regulator/Kconfig
+##
+CONFIG_REGULATOR=y
+
 ##
 ## file: drivers/rtc/Kconfig
 ##
@@ -1722,6 +1744,13 @@ CONFIG_USB_SL811_HCD=m
 # CONFIG_USB_SL811_HCD_ISO is not set
 CONFIG_USB_SL811_CS=m
 
+##
+## file: drivers/usb/typec/Kconfig
+##
+CONFIG_TYPEC=m
+CONFIG_TYPEC_TCPM=m
+CONFIG_TYPEC_FUSB302=m
+
 ##
 ## file: drivers/vfio/Kconfig
 ##