diff --git a/debian/changelog b/debian/changelog
index c6111aa78..126436433 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ linux (4.11~rc7-1~exp1) UNRELEASED; urgency=medium
   * [arm64,x86] Replace securelevel patch set with lockdown patch set
   * [x86] Make hyperv-modules depends on nic-shared-modules, as hv_utils now
     implements PTP clock
+  * [arm64] Enable ARCH_SUNXI, RTC_DRV_SUN6I as built-in,
+    MMC_SUNXI and PHY_SUN4I_USB as modules (Closes: #860855)
 
  -- Lukas Wunner <lukas@wunner.de>  Sun, 16 Apr 2017 16:09:27 +0200
 
diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index 27da44863..e7027c099 100644
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@@ -40,6 +40,7 @@ CONFIG_KVM=y
 ##
 ## file: arch/arm64/Kconfig.platforms
 ##
+CONFIG_ARCH_SUNXI=y
 CONFIG_ARCH_BCM2835=y
 CONFIG_ARCH_HISI=y
 CONFIG_ARCH_MESON=y
@@ -343,6 +344,7 @@ CONFIG_MMC_SDHCI_MSM=m
 CONFIG_MMC_SPI=m
 CONFIG_MMC_DW=m
 CONFIG_MMC_DW_K3=m
+CONFIG_MMC_SUNXI=m
 
 ##
 ## file: drivers/mtd/spi-nor/Kconfig
@@ -530,6 +532,7 @@ CONFIG_PCI_HOST_THUNDER_ECAM=y
 ## file: drivers/phy/Kconfig
 ##
 CONFIG_PHY_HI6220_USB=m
+CONFIG_PHY_SUN4I_USB=m
 CONFIG_PHY_QCOM_APQ8064_SATA=m
 CONFIG_PHY_QCOM_IPQ806X_SATA=m
 CONFIG_PHY_XGENE=m
@@ -623,6 +626,7 @@ CONFIG_RTC_DRV_DS1307=y
 CONFIG_RTC_DRV_MAX77686=y
 CONFIG_RTC_DRV_EFI=y
 CONFIG_RTC_DRV_PL031=y
+CONFIG_RTC_DRV_SUN6I=y
 CONFIG_RTC_DRV_PM8XXX=m
 CONFIG_RTC_DRV_TEGRA=y
 CONFIG_RTC_DRV_XGENE=y