diff --git a/debian/changelog b/debian/changelog
index 1f5f854e5..454dba7f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,14 @@ linux (4.8~rc3-1~exp1) UNRELEASED; urgency=medium
   * [arm64] Enable more QCOM options: MSM_GCC_8996, MSM_MMCC_8996, QCOM_HIDMA,
     QCOM_HIDMA_MGMT, PCIE_QCOM, PINCTRL_MSM8996, QCOM_Q6V5_PIL.
 
+  [ Ben Hutchings ]
+  * Update config for 4.8:
+    * Enable HID_LED as module instead of USB_LED
+    - [alpha] Enable RTC_CLASS and RTC_DRV_ALPHA instead of GEN_RTC
+    - [armhf] Rename omapdrm display config symbols
+    - [armhf] Enable IIO_ST_ACCEL_3AXIS as module instead of LIS3L02DQ
+    * [hppa] Enable RTC_CLASS and RTC_DRV_GENERIC instead of GEN_RTC
+
  -- Ben Hutchings <ben@decadent.org.uk>  Sun, 28 Aug 2016 19:01:59 +0100
 
 linux (4.7.2-1) unstable; urgency=medium
diff --git a/debian/config/alpha/config b/debian/config/alpha/config
index ce5d77def..c2b31f073 100644
--- a/debian/config/alpha/config
+++ b/debian/config/alpha/config
@@ -151,8 +151,6 @@ CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
 CONFIG_RTC=m
-CONFIG_GEN_RTC=m
-CONFIG_GEN_RTC_X=y
 CONFIG_DTLK=m
 CONFIG_APPLICOM=m
 CONFIG_RAW_DRIVER=m
@@ -749,6 +747,12 @@ CONFIG_PNP=y
 ##
 CONFIG_ISAPNP=y
 
+##
+## file: drivers/rtc/Kconfig
+##
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_ALPHA=y
+
 ##
 ## file: drivers/scsi/Kconfig
 ##
diff --git a/debian/config/armhf/config b/debian/config/armhf/config
index 88aa489f0..0a9be6fd2 100644
--- a/debian/config/armhf/config
+++ b/debian/config/armhf/config
@@ -295,9 +295,9 @@ CONFIG_DRM_OMAP=m
 ##
 ## file: drivers/gpu/drm/omapdrm/displays/Kconfig
 ##
-CONFIG_DISPLAY_ENCODER_TPD12S015=m
-CONFIG_DISPLAY_CONNECTOR_HDMI=m
-CONFIG_DISPLAY_PANEL_SONY_ACX565AKM=m
+CONFIG_DRM_OMAP_ENCODER_TPD12S015=m
+CONFIG_DRM_OMAP_CONNECTOR_HDMI=m
+CONFIG_DRM_OMAP_PANEL_SONY_ACX565AKM=m
 
 ##
 ## file: drivers/gpu/drm/omapdrm/dss/Kconfig
@@ -402,6 +402,11 @@ CONFIG_I2C_MUX_PCA954x=m
 ##
 CONFIG_IIO=m
 
+##
+## file: drivers/iio/accel/Kconfig
+##
+CONFIG_IIO_ST_ACCEL_3AXIS=m
+
 ##
 ## file: drivers/iio/adc/Kconfig
 ##
@@ -575,7 +580,6 @@ CONFIG_MMC_SDHCI_ESDHC_IMX=m
 CONFIG_MMC_SDHCI_TEGRA=m
 CONFIG_MMC_SDHCI_S3C=m
 CONFIG_MMC_SDHCI_PXAV3=m
-CONFIG_MMC_SDHCI_BCM2835=m
 CONFIG_MMC_SDHCI_IPROC=m
 CONFIG_MMC_OMAP=m
 CONFIG_MMC_OMAP_HS=m
@@ -618,9 +622,13 @@ CONFIG_CAN_SUN4I=m
 ## file: drivers/net/dsa/Kconfig
 ##
 CONFIG_NET_DSA_MV88E6060=m
-CONFIG_NET_DSA_MV88E6XXX=m
 CONFIG_NET_DSA_BCM_SF2=m
 
+##
+## file: drivers/net/dsa/mv88e6xxx/Kconfig
+##
+CONFIG_NET_DSA_MV88E6XXX=m
+
 ##
 ## file: drivers/net/ethernet/Kconfig
 ##
@@ -968,11 +976,6 @@ CONFIG_SPI_TEGRA114=m
 CONFIG_SPI_TEGRA20_SFLASH=m
 CONFIG_SPI_SPIDEV=y
 
-##
-## file: drivers/staging/iio/accel/Kconfig
-##
-CONFIG_LIS3L02DQ=m
-
 ##
 ## file: drivers/thermal/Kconfig
 ##
diff --git a/debian/config/config b/debian/config/config
index f01cd7ece..df5784edd 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -159,9 +159,13 @@ CONFIG_A11Y_BRAILLE_CONSOLE=y
 CONFIG_ACPI_TABLE_UPGRADE=y
 # CONFIG_ACPI_BGRT is not set
 # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
+# CONFIG_PMIC_OPREGION is not set
+
+##
+## file: drivers/acpi/nfit/Kconfig
+##
 CONFIG_ACPI_NFIT=m
 # CONFIG_ACPI_NFIT_DEBUG is not set
-# CONFIG_PMIC_OPREGION is not set
 
 ##
 ## file: drivers/android/Kconfig
@@ -334,7 +338,6 @@ CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 ## file: drivers/block/zram/Kconfig
 ##
 CONFIG_ZRAM=m
-CONFIG_ZRAM_LZ4_COMPRESS=y
 
 ##
 ## file: drivers/bluetooth/Kconfig
@@ -579,6 +582,11 @@ CONFIG_DRM_BOCHS=m
 # CONFIG_DRM_NXP_PTN3460 is not set
 # CONFIG_DRM_PARADE_PS8622 is not set
 
+##
+## file: drivers/gpu/drm/bridge/adv7511/Kconfig
+##
+# CONFIG_DRM_I2C_ADV7511 is not set
+
 ##
 ## file: drivers/gpu/drm/cirrus/Kconfig
 ##
@@ -587,7 +595,6 @@ CONFIG_DRM_CIRRUS_QEMU=m
 ##
 ## file: drivers/gpu/drm/i2c/Kconfig
 ##
-# CONFIG_DRM_I2C_ADV7511 is not set
 # CONFIG_DRM_I2C_CH7006 is not set
 # CONFIG_DRM_I2C_SIL164 is not set
 # CONFIG_DRM_I2C_NXP_TDA998X is not set
@@ -684,6 +691,7 @@ CONFIG_HID_ICADE=m
 CONFIG_HID_TWINHAN=m
 CONFIG_HID_KENSINGTON=y
 CONFIG_HID_LCPOWER=m
+CONFIG_HID_LED=m
 CONFIG_HID_LENOVO=m
 CONFIG_HID_LOGITECH=y
 CONFIG_HID_LOGITECH_DJ=m
@@ -2708,9 +2716,13 @@ CONFIG_CAN_8DEV_USB=m
 ## file: drivers/net/dsa/Kconfig
 ##
 # CONFIG_NET_DSA_MV88E6060 is not set
-# CONFIG_NET_DSA_MV88E6XXX is not set
 # CONFIG_NET_DSA_BCM_SF2 is not set
 
+##
+## file: drivers/net/dsa/mv88e6xxx/Kconfig
+##
+# CONFIG_NET_DSA_MV88E6XXX is not set
+
 ##
 ## file: drivers/net/ethernet/Kconfig
 ##
@@ -2768,7 +2780,6 @@ CONFIG_CNIC=m
 CONFIG_TIGON3=m
 CONFIG_BNX2X=m
 CONFIG_BNX2X_SRIOV=y
-CONFIG_BNX2X_VXLAN=y
 # CONFIG_SYSTEMPORT is not set
 CONFIG_BNXT=m
 CONFIG_BNXT_SRIOV=y
@@ -2859,7 +2870,6 @@ CONFIG_NET_VENDOR_EMULEX=y
 ##
 CONFIG_BE2NET=m
 CONFIG_BE2NET_HWMON=y
-CONFIG_BE2NET_VXLAN=y
 
 ##
 ## file: drivers/net/ethernet/ezchip/Kconfig
@@ -2884,13 +2894,11 @@ CONFIG_IGB_DCA=y
 CONFIG_IGBVF=m
 CONFIG_IXGB=m
 CONFIG_IXGBE=m
-CONFIG_IXGBE_VXLAN=y
 CONFIG_IXGBE_HWMON=y
 CONFIG_IXGBE_DCA=y
 CONFIG_IXGBE_DCB=y
 CONFIG_IXGBEVF=m
 CONFIG_I40E=m
-CONFIG_I40E_VXLAN=y
 CONFIG_I40E_DCB=y
 CONFIG_I40E_FCOE=y
 CONFIG_I40EVF=m
@@ -2916,7 +2924,6 @@ CONFIG_NET_VENDOR_MELLANOX=y
 ##
 CONFIG_MLX4_EN=m
 CONFIG_MLX4_EN_DCB=y
-CONFIG_MLX4_EN_VXLAN=y
 CONFIG_MLX4_DEBUG=y
 
 ##
@@ -2988,7 +2995,6 @@ CONFIG_QLA3XXX=m
 CONFIG_QLCNIC=m
 CONFIG_QLCNIC_SRIOV=y
 CONFIG_QLCNIC_DCB=y
-CONFIG_QLCNIC_VXLAN=y
 CONFIG_QLCNIC_HWMON=y
 CONFIG_QLGE=m
 CONFIG_NETXEN_NIC=m
@@ -4170,7 +4176,6 @@ CONFIG_STAGING=y
 # CONFIG_ADIS16203 is not set
 # CONFIG_ADIS16209 is not set
 # CONFIG_ADIS16240 is not set
-# CONFIG_LIS3L02DQ is not set
 # CONFIG_SCA3000 is not set
 
 ##
@@ -4249,11 +4254,6 @@ CONFIG_STAGING=y
 # CONFIG_LIRC_STAGING is not set
 # CONFIG_LIRC_PARALLEL is not set
 
-##
-## file: drivers/staging/media/timb/Kconfig
-##
-# CONFIG_VIDEO_TIMBERDALE is not set
-
 ##
 ## file: drivers/staging/most/Kconfig
 ##
@@ -4596,7 +4596,6 @@ CONFIG_USB_SEVSEG=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_LEGOTOWER=m
 CONFIG_USB_LCD=m
-CONFIG_USB_LED=m
 CONFIG_USB_CYPRESS_CY7C63=m
 CONFIG_USB_CYTHERM=m
 CONFIG_USB_IDMOUSE=m
diff --git a/debian/config/hppa/config b/debian/config/hppa/config
index f06c212fa..44f0ca414 100644
--- a/debian/config/hppa/config
+++ b/debian/config/hppa/config
@@ -47,8 +47,6 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
-CONFIG_GEN_RTC=y
-# CONFIG_GEN_RTC_X is not set
 # CONFIG_DTLK is not set
 # CONFIG_APPLICOM is not set
 
@@ -422,7 +420,8 @@ CONFIG_I82365=m
 ##
 ## file: drivers/rtc/Kconfig
 ##
-# CONFIG_RTC_CLASS is not set
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_GENERIC=y
 
 ##
 ## file: drivers/scsi/Kconfig
diff --git a/debian/config/kernelarch-mips/config.loongson-3 b/debian/config/kernelarch-mips/config.loongson-3
index dcdc527b9..a8235bfc4 100644
--- a/debian/config/kernelarch-mips/config.loongson-3
+++ b/debian/config/kernelarch-mips/config.loongson-3
@@ -4,12 +4,12 @@
 ## choice: System type
 CONFIG_MACH_LOONGSON64=y
 ## end choice
-CONFIG_HOTPLUG_CPU=y
 ## choice: Kernel code model
 # CONFIG_32BIT is not set
 CONFIG_64BIT=y
 ## end choice
 CONFIG_SMP=y
+CONFIG_HOTPLUG_CPU=y
 
 ##
 ## file: arch/mips/loongson64/Kconfig
diff --git a/debian/config/kernelarch-mips/config.octeon b/debian/config/kernelarch-mips/config.octeon
index 387d9643a..f889f9efa 100644
--- a/debian/config/kernelarch-mips/config.octeon
+++ b/debian/config/kernelarch-mips/config.octeon
@@ -4,12 +4,12 @@
 ## choice: System type
 CONFIG_CAVIUM_OCTEON_SOC=y
 ## end choice
-# CONFIG_HOTPLUG_CPU is not set
 ## choice: Kernel code model
 # CONFIG_32BIT is not set
 CONFIG_64BIT=y
 ## end choice
 CONFIG_SMP=y
+# CONFIG_HOTPLUG_CPU is not set
 CONFIG_NR_CPUS=32
 
 ##
diff --git a/debian/config/kernelarch-powerpc/config b/debian/config/kernelarch-powerpc/config
index 97e37a85c..7b709e53d 100644
--- a/debian/config/kernelarch-powerpc/config
+++ b/debian/config/kernelarch-powerpc/config
@@ -378,7 +378,7 @@ CONFIG_ADB=y
 CONFIG_ADB_CUDA=y
 CONFIG_ADB_PMU=y
 CONFIG_ADB_PMU_LED=y
-# CONFIG_ADB_PMU_LED_IDE is not set
+# CONFIG_ADB_PMU_LED_DISK is not set
 CONFIG_PMAC_SMU=y
 # CONFIG_PMAC_APM_EMU is not set
 CONFIG_PMAC_MEDIABAY=y
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index ac68c6be1..49384f0c7 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -330,7 +330,6 @@ CONFIG_IPMI_HANDLER=m
 # CONFIG_IPMI_PANIC_EVENT is not set
 CONFIG_IPMI_DEVICE_INTERFACE=m
 CONFIG_IPMI_SI=m
-# CONFIG_IPMI_SI_PROBE_DEFAULTS is not set
 CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_POWEROFF=m
 
@@ -351,7 +350,6 @@ CONFIG_TCG_CRB=m
 ##
 ## file: drivers/char/tpm/st33zp24/Kconfig
 ##
-CONFIG_TCG_TIS_ST33ZP24=m
 CONFIG_TCG_TIS_ST33ZP24_I2C=m
 
 ##
@@ -1564,7 +1562,6 @@ CONFIG_LNET_XPRT_IB=m
 CONFIG_LUSTRE_FS=m
 CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER=8192
 # CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set
-CONFIG_LUSTRE_LLITE_LLOOP=m
 
 ##
 ## file: drivers/staging/media/Kconfig
@@ -1849,9 +1846,7 @@ CONFIG_PSTORE=y
 ## file: init/Kconfig
 ##
 CONFIG_USELIB=y
-## choice: Cputime accounting
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
-## end choice
 CONFIG_SGETMASK_SYSCALL=y
 CONFIG_SYSFS_SYSCALL=y
 
diff --git a/debian/config/m68k/config b/debian/config/m68k/config
index 941a7c0eb..b416341b7 100644
--- a/debian/config/m68k/config
+++ b/debian/config/m68k/config
@@ -550,11 +550,6 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 ##
 # CONFIG_USB_SUPPORT is not set
 
-##
-## file: drivers/vhost/Kconfig
-##
-# CONFIG_VHOST_NET is not set
-
 ##
 ## file: drivers/video/backlight/Kconfig
 ##
diff --git a/debian/config/s390x/config b/debian/config/s390x/config
index f11fada71..b1e5000b3 100644
--- a/debian/config/s390x/config
+++ b/debian/config/s390x/config
@@ -17,7 +17,6 @@ CONFIG_PACK_STACK=y
 CONFIG_QDIO=y
 CONFIG_PCI=y
 CONFIG_PCI_NR_FUNCTIONS=64
-CONFIG_PCI_NR_MSI=256
 CONFIG_CHSC_SCH=m
 CONFIG_SCM_BUS=y
 CONFIG_EADM_SCH=m