diff --git a/.github/workflows/yocto-builds.yml b/.github/workflows/yocto-builds.yml
index 87b009b..b16cb09 100644
--- a/.github/workflows/yocto-builds.yml
+++ b/.github/workflows/yocto-builds.yml
@@ -20,6 +20,7 @@ jobs:
           - raspberrypi0-2w
           - raspberrypi0
           - raspberrypi0-wifi
+          - raspberrypi2-64
           - raspberrypi2
           - raspberrypi3-64
           - raspberrypi3
diff --git a/conf/machine/raspberrypi-armv8.conf b/conf/machine/raspberrypi-armv8.conf
index 0b42309..5ba55af 100644
--- a/conf/machine/raspberrypi-armv8.conf
+++ b/conf/machine/raspberrypi-armv8.conf
@@ -23,6 +23,7 @@ MACHINE_EXTRA_RRECOMMENDS += "\
 "
 
 RPI_KERNEL_DEVICETREE = " \
+    broadcom/bcm2710-rpi-2-b.dtb \
     broadcom/bcm2710-rpi-3-b.dtb \
     broadcom/bcm2710-rpi-3-b-plus.dtb \
     broadcom/bcm2837-rpi-3-b.dtb \
diff --git a/conf/machine/raspberrypi2-64.conf b/conf/machine/raspberrypi2-64.conf
new file mode 100644
index 0000000..7eb014e
--- /dev/null
+++ b/conf/machine/raspberrypi2-64.conf
@@ -0,0 +1,30 @@
+#@TYPE: Machine
+#@NAME: RaspberryPi 2 V1.2 Development Board
+#@DESCRIPTION: Machine configuration for the RaspberryPi 2 in 64 bits mode
+
+MACHINEOVERRIDES =. "raspberrypi3-64:"
+
+DEFAULTTUNE ?= "cortexa53-nocrypto"
+require conf/machine/include/arm/armv8a/tune-cortexa53.inc
+include conf/machine/include/rpi-base.inc
+
+RPI_KERNEL_DEVICETREE = " \
+    broadcom/bcm2710-rpi-2-b.dtb \
+    broadcom/bcm2710-rpi-3-b.dtb \
+    broadcom/bcm2710-rpi-3-b-plus.dtb \
+    broadcom/bcm2837-rpi-3-b.dtb \
+    broadcom/bcm2710-rpi-cm3.dtb \
+    "
+
+SDIMG_KERNELIMAGE ?= "kernel8.img"
+# When u-boot is enabled we need to use the "Image" format and the "booti"
+# command to load the kernel
+KERNEL_IMAGETYPE_UBOOT ?= "Image"
+# "zImage" not supported on arm64 and ".gz" images not supported by bootloader yet
+KERNEL_IMAGETYPE_DIRECT ?= "Image"
+KERNEL_BOOTCMD ?= "booti"
+UBOOT_MACHINE = "rpi_arm64_config"
+SERIAL_CONSOLES ?= "115200;ttyAMA0"
+
+VC4DTBO ?= "vc4-fkms-v3d"
+ARMSTUB ?= "armstub8.bin"
diff --git a/conf/machine/raspberrypi3-64.conf b/conf/machine/raspberrypi3-64.conf
index b2d64a4..53e7c2a 100644
--- a/conf/machine/raspberrypi3-64.conf
+++ b/conf/machine/raspberrypi3-64.conf
@@ -16,6 +16,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa53.inc
 include conf/machine/include/rpi-base.inc
 
 RPI_KERNEL_DEVICETREE = " \
+    broadcom/bcm2710-rpi-2-b.dtb \
     broadcom/bcm2710-rpi-3-b.dtb \
     broadcom/bcm2710-rpi-3-b-plus.dtb \
     broadcom/bcm2837-rpi-3-b.dtb \
diff --git a/docs/layer-contents.md b/docs/layer-contents.md
index 78d66e3..84ea4de 100644
--- a/docs/layer-contents.md
+++ b/docs/layer-contents.md
@@ -7,6 +7,7 @@
 * raspberrypi0-wifi
 * raspberrypi0-2w-64
 * raspberrypi2
+* raspberrypi2-64 (64 bit kernel & userspace)
 * raspberrypi3
 * raspberrypi3-64 (64 bit kernel & userspace)
 * raspberrypi4
@@ -15,6 +16,9 @@
 * raspberrypi-cm (dummy alias for raspberrypi)
 * raspberrypi-cm3
 
+Note: The raspberrypi2-64 machine includes 64-bit support for Raspberry Pi 2B
+V1.2.
+
 Note: The raspberrypi3 machines include support for Raspberry Pi 3B+.
 
 ## Multi-board Machines