diff --git a/debian/changelog b/debian/changelog
index 12b6a9a92..acf218f39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -294,6 +294,13 @@ linux (4.16.13-1) UNRELEASED; urgency=medium
   [ Bastian Blank ]
   * hv_netvsc: Fix a network regression after ifdown/ifup
 
+  [ Vagrant Cascadian ]
+  * [arm64] Enable configuration options used in Firefly-RK3399:
+    DRM_ROCKCHIP, ROCKCHIP_ANALOGIX_DP, ROCKCHIP_DW_HDMI,
+    ROCKCHIP_DW_MIPI_DSI, ROCKCHIP_SARADC, ROCKCHIP_IOMMU, ROCKCHIP_EFUSE,
+    PHY_ROCKCHIP_TYPEC, ROCKCHIP_THERMAL (Closes: #901159).
+    Thanks to Heinrich Schuchardt.
+
  -- Salvatore Bonaccorso <carnil@debian.org>  Wed, 30 May 2018 08:41:30 +0200
 
 linux (4.16.12-1) unstable; urgency=medium
diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index 4d8629890..aa93aa8e3 100644
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@@ -288,6 +288,14 @@ CONFIG_NOUVEAU_PLATFORM_DRIVER=y
 ##
 CONFIG_DRM_PANEL_SIMPLE=m
 
+##
+## file: drivers/gpu/drm/rockchip/Kconfig
+##
+CONFIG_DRM_ROCKCHIP=m
+CONFIG_ROCKCHIP_ANALOGIX_DP=y
+CONFIG_ROCKCHIP_DW_HDMI=y
+CONFIG_ROCKCHIP_DW_MIPI_DSI=y
+
 ##
 ## file: drivers/gpu/drm/tegra/Kconfig
 ##
@@ -342,6 +350,7 @@ CONFIG_AXP20X_ADC=m
 CONFIG_AXP288_ADC=m
 CONFIG_QCOM_SPMI_IADC=m
 CONFIG_QCOM_SPMI_VADC=m
+CONFIG_ROCKCHIP_SARADC=m
 
 ##
 ## file: drivers/iio/humidity/Kconfig
@@ -366,6 +375,7 @@ CONFIG_INPUT_HISI_POWERKEY=m
 ##
 ## file: drivers/iommu/Kconfig
 ##
+CONFIG_ROCKCHIP_IOMMU=y
 CONFIG_TEGRA_IOMMU_SMMU=y
 CONFIG_ARM_SMMU=y
 CONFIG_ARM_SMMU_V3=y
@@ -657,6 +667,7 @@ CONFIG_WLCORE_SDIO=m
 ## file: drivers/nvmem/Kconfig
 ##
 CONFIG_QCOM_QFPROM=m
+CONFIG_ROCKCHIP_EFUSE=m
 CONFIG_NVMEM_SUNXI_SID=m
 
 ##
@@ -730,6 +741,7 @@ CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PHY_ROCKCHIP_EMMC=m
 CONFIG_PHY_ROCKCHIP_INNO_USB2=m
 CONFIG_PHY_ROCKCHIP_PCIE=m
+CONFIG_PHY_ROCKCHIP_TYPEC=m
 
 ##
 ## file: drivers/phy/tegra/Kconfig
@@ -922,6 +934,7 @@ CONFIG_OPTEE=m
 CONFIG_THERMAL=y
 CONFIG_CPU_THERMAL=y
 CONFIG_HISI_THERMAL=m
+CONFIG_ROCKCHIP_THERMAL=m
 CONFIG_ARMADA_THERMAL=m
 CONFIG_QCOM_SPMI_TEMP_ALARM=m