diff --git a/debian/boot.txt b/debian/boot.txt
index a0f45aa..7f53996 100644
--- a/debian/boot.txt
+++ b/debian/boot.txt
@@ -15,6 +15,11 @@
     setenv fdt_file fsl-imx8mq-phanbell.dtb
 elif test ${baseboardid} = 2; then
     setenv fdt_file fsl-imx8mq-yorktown.dtb
+else
+    # EVT Boards have quirky baseboard ID resistors, so fall back
+    # to phanbell if we're unsure what the board is.
+    echo "Unknown baseboard revision, selecting phanbell dtb."
+    setenv fdt_file fsl-imx8mq-phanbell.dtb
 fi
 
 cmdline="console=ttymxc0,115200 console=tty0 earlycon=ec_imx6q,0x30860000,115200 root=${root} rootfstype=ext4 rw rootwait init=/sbin/init net.ifnames=0 pci=pcie_bus_perf"
diff --git a/debian/changelog b/debian/changelog
index a5eb3f5..ce6ca6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+uboot-imx (0.5) animal; urgency=medium
+
+  * Add fallback selection for device tree
+
+ -- AIY Projects <support-aiyprojects@google.com>  Thu, 06 Dec 2018 11:26:58 -0800
+
 uboot-imx (0.4) animal; urgency=medium
 
   * Change PMIC voltages to latest configuration.