diff --git a/debian/changelog b/debian/changelog
index ad515924b..a286e303d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ linux (4.6~rc3-1~exp2) UNRELEASED; urgency=medium
 
   [ Martin Michlmayr ]
   * [armel, armhf] Use new Marvell CESA driver.
+  * [arm64] Enable support for NVIDIA Tegra.
+  * [arm64] udeb: Create fb-modules.
 
  -- Ben Hutchings <ben@decadent.org.uk>  Wed, 20 Apr 2016 17:25:51 +0100
 
diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index 432f348f3..882073f3d 100644
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@@ -27,6 +27,7 @@ CONFIG_CRYPTO_CRC32_ARM64=y
 CONFIG_ARCH_HISI=y
 CONFIG_ARCH_QCOM=y
 CONFIG_ARCH_SEATTLE=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_VEXPRESS=y
 CONFIG_ARCH_XGENE=y
 
@@ -34,6 +35,7 @@ CONFIG_ARCH_XGENE=y
 ## file: drivers/ata/Kconfig
 ##
 CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_AHCI_TEGRA=m
 CONFIG_AHCI_XGENE=m
 
 ##
@@ -66,6 +68,7 @@ CONFIG_CRYPTO_DEV_QCE=m
 ## file: drivers/dma/Kconfig
 ##
 CONFIG_DMADEVICES=y
+CONFIG_TEGRA20_APB_DMA=y
 
 ##
 ## file: drivers/dma/qcom/Kconfig
@@ -101,6 +104,16 @@ CONFIG_DRM_MSM_DSI_PLL=y
 CONFIG_DRM_MSM_DSI_28NM_PHY=y
 CONFIG_DRM_MSM_DSI_20NM_PHY=y
 
+##
+## file: drivers/gpu/drm/tegra/Kconfig
+##
+CONFIG_DRM_TEGRA=m
+
+##
+## file: drivers/gpu/host1x/Kconfig
+##
+CONFIG_TEGRA_HOST1X=m
+
 ##
 ## file: drivers/hwspinlock/Kconfig
 ##
@@ -111,6 +124,12 @@ CONFIG_HWSPINLOCK_QCOM=m
 ##
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
 CONFIG_I2C_QUP=m
+CONFIG_I2C_TEGRA=m
+
+##
+## file: drivers/input/keyboard/Kconfig
+##
+CONFIG_KEYBOARD_TEGRA=m
 
 ##
 ## file: drivers/input/misc/Kconfig
@@ -118,11 +137,21 @@ CONFIG_I2C_QUP=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_UINPUT=m
 
+##
+## file: drivers/iommu/Kconfig
+##
+CONFIG_TEGRA_IOMMU_SMMU=y
+
 ##
 ## file: drivers/leds/Kconfig
 ##
 CONFIG_LEDS_GPIO=m
 
+##
+## file: drivers/memory/tegra/Kconfig
+##
+CONFIG_TEGRA_MC=y
+
 ##
 ## file: drivers/mfd/Kconfig
 ##
@@ -139,6 +168,7 @@ CONFIG_MMC=y
 CONFIG_MMC_ARMMMCI=m
 CONFIG_MMC_QCOM_DML=m
 CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_SDHCI_TEGRA=m
 CONFIG_MMC_SDHCI_MSM=m
 CONFIG_MMC_SPI=m
 CONFIG_MMC_DW=m
@@ -274,6 +304,12 @@ CONFIG_POWER_RESET_XGENE=y
 CONFIG_POWER_RESET_SYSCON=y
 CONFIG_POWER_RESET_SYSCON_POWEROFF=y
 
+##
+## file: drivers/pwm/Kconfig
+##
+CONFIG_PWM=y
+CONFIG_PWM_TEGRA=m
+
 ##
 ## file: drivers/regulator/Kconfig
 ##
@@ -291,6 +327,7 @@ CONFIG_RESET_CONTROLLER=y
 ##
 CONFIG_RTC_DRV_EFI=y
 CONFIG_RTC_DRV_PL031=y
+CONFIG_RTC_DRV_TEGRA=y
 CONFIG_RTC_DRV_XGENE=y
 
 ##
@@ -306,15 +343,25 @@ CONFIG_QCOM_SMEM=m
 CONFIG_QCOM_SMD=m
 CONFIG_QCOM_SMD_RPM=m
 
+##
+## file: drivers/soc/tegra/Kconfig
+##
+CONFIG_ARCH_TEGRA_132_SOC=y
+CONFIG_ARCH_TEGRA_210_SOC=y
+
 ##
 ## file: drivers/spi/Kconfig
 ##
 CONFIG_SPI_QUP=m
+CONFIG_SPI_TEGRA114=m
+CONFIG_SPI_TEGRA20_SFLASH=m
+CONFIG_SPI_TEGRA20_SLINK=m
 
 ##
 ## file: drivers/thermal/Kconfig
 ##
 CONFIG_HISI_THERMAL=m
+CONFIG_TEGRA_SOCTHERM=m
 
 ##
 ## file: drivers/tty/serial/Kconfig
@@ -323,6 +370,7 @@ CONFIG_SERIAL_AMBA_PL010=y
 CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_SERIAL_TEGRA=m
 CONFIG_SERIAL_MSM=y
 CONFIG_SERIAL_MSM_CONSOLE=y
 
@@ -353,6 +401,7 @@ CONFIG_USB_XHCI_HCD=m
 CONFIG_USB_XHCI_PLATFORM=m
 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_MSM=m
+CONFIG_USB_EHCI_TEGRA=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
 CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_OHCI_HCD_PLATFORM=m
@@ -371,6 +420,7 @@ CONFIG_VIRTIO_MMIO=m
 ##
 ## file: drivers/watchdog/Kconfig
 ##
+CONFIG_TEGRA_WATCHDOG=m
 CONFIG_QCOM_WDT=m
 
 ##
@@ -378,6 +428,11 @@ CONFIG_QCOM_WDT=m
 ##
 CONFIG_PSTORE=y
 
+##
+## file: sound/pci/hda/Kconfig
+##
+CONFIG_SND_HDA_TEGRA=m
+
 ##
 ## file: sound/soc/Kconfig
 ##
@@ -388,3 +443,15 @@ CONFIG_SND_SOC=m
 ##
 CONFIG_SND_SOC_QCOM=m
 
+##
+## file: sound/soc/tegra/Kconfig
+##
+CONFIG_SND_SOC_TEGRA=m
+CONFIG_SND_SOC_TEGRA_RT5640=m
+CONFIG_SND_SOC_TEGRA_WM8753=m
+CONFIG_SND_SOC_TEGRA_WM8903=m
+CONFIG_SND_SOC_TEGRA_TRIMSLICE=m
+CONFIG_SND_SOC_TEGRA_ALC5632=m
+CONFIG_SND_SOC_TEGRA_MAX98090=m
+CONFIG_SND_SOC_TEGRA_RT5677=m
+
diff --git a/debian/installer/arm64/modules/arm64/fb-modules b/debian/installer/arm64/modules/arm64/fb-modules
new file mode 100644
index 000000000..8d35a44bb
--- /dev/null
+++ b/debian/installer/arm64/modules/arm64/fb-modules
@@ -0,0 +1 @@
+tegra-drm
diff --git a/debian/installer/arm64/modules/arm64/i2c-modules b/debian/installer/arm64/modules/arm64/i2c-modules
index 203a607e7..bfe65b4cd 100644
--- a/debian/installer/arm64/modules/arm64/i2c-modules
+++ b/debian/installer/arm64/modules/arm64/i2c-modules
@@ -1 +1,2 @@
 #include <i2c-modules>
+i2c-tegra
diff --git a/debian/installer/arm64/modules/arm64/sata-modules b/debian/installer/arm64/modules/arm64/sata-modules
index 5beb3f3cd..312af7bcc 100644
--- a/debian/installer/arm64/modules/arm64/sata-modules
+++ b/debian/installer/arm64/modules/arm64/sata-modules
@@ -1,5 +1,6 @@
 #include <sata-modules>
 ahci_platform
+ahci_tegra
 ahci_xgene
 phy-qcom-apq8064-sata
 phy-qcom-ipq806x-sata